Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: community/camlp5/PKGBUILD community/dzen2/PKGBUILD extra/boost/PKGBUILD extra/libxmi/PKGBUILD extra/mesa/PKGBUILD multilib/lib32-mesa/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-11-02 10:47:02 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-11-02 10:47:02 -0300
commit: 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch)
tree: e1bf1a01ae7443e4a9f460200dad9580565b27c7
parent: 3e3dd870121c91097220248a601578b92d332f2b (diff)
parent: 37a1064b8105764414f279ced442e6ba2f63bea1 (diff)
271 files changed, 5000 insertions, 11703 deletions
diff --git a/community-staging/acetoneiso2/PKGBUILD b/community-staging/acetoneiso2/PKGBUILD
deleted file mode 100644
index 9e0bb04cd..000000000
--- a/community-staging/acetoneiso2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Wes Brewer <brewerw@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=acetoneiso2
-pkgver=2.3
-pkgrel=3
-pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)"
-arch=('i686' 'x86_64')
-url="http://www.acetoneteam.org"
-license=('GPL3')
-depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon')
-optdepends=("p7zip: for ISO compress/decompress support")
-conflicts=('acetoneiso')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz)
-md5sums=('225f7af687016690ff28b9771a1ce179')
-
-build() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	qmake
-	# needed for phonon
-	sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile
-	make
-}
-
-package() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/acetoneiso2/acetoneiso2.install b/community-staging/acetoneiso2/acetoneiso2.install
deleted file mode 100644
index 1a3984e24..000000000
--- a/community-staging/acetoneiso2/acetoneiso2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-cat << EOF
-  -->
-  -->  Please remember to add 'fuse' to your MODULES array in /etc/rc.conf
-  -->
-EOF
-}
-
-post_upgrade() {
-    post_install $*
-}
diff --git a/community-staging/clipgrab/PKGBUILD b/community-staging/clipgrab/PKGBUILD
deleted file mode 100644
index df3c57383..000000000
--- a/community-staging/clipgrab/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: thacrazze <thacrazze|googlemail|com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=clipgrab
-pkgver=3.1.0.2
-pkgrel=2
-pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
-arch=('i686' 'x86_64')
-url='http://clipgrab.de/'
-license=('GPL')
-depends=('qt' 'qtwebkit')
-optdepends=('ffmpeg: for some encodings')
-source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop)
-md5sums=('1250e1fb29cd88b7ce1a37d937de0146'
-         'ef030502ae0922e632742f47283313f4'
-         '9a141791f6952917c441050c3dac81ce')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  qmake && make
-}
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm755 ${pkgname} $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/clipgrab/clipgrab.desktop b/community-staging/clipgrab/clipgrab.desktop
deleted file mode 100644
index dad31cfdd..000000000
--- a/community-staging/clipgrab/clipgrab.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=ClipGrab
-GenericName=Video Downloader
-GenericName[de]=Video-Downloader
-Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
-Icon=/usr/share/pixmaps/clipgrab.png
-Exec=clipgrab
-TryExec=clipgrab
-Terminal=false
-Categories=Qt;AudioVideo;Audio;Video;
diff --git a/community-staging/clipgrab/clipgrab.png b/community-staging/clipgrab/clipgrab.png
deleted file mode 100644
index 2573fed20..000000000
--- a/community-staging/clipgrab/clipgrab.png
+++ /dev/null
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 9f307fec3..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57158 2011-10-22 17:28:35Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.1.3
-pkgrel=6
-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' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('asio' 'cmake')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('6d4a00cdd0b59a05b1521184508d4637')
-
-build() {
-  cd $pkgname-$pkgver
-
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index 4956a1819..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 57146 2011-10-22 15:06:35Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
-         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
-         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
-         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
-         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.5
-pkgrel=2
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('dfa16f5208463e81ba8ca801948c353a'
-         'b284be39d147ec799f1116a6abc068b4'
-         'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  ./reconf-all
-  ./configure --prefix=/usr -C
-
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make DESTDIR="${pkgdir}" install
-  cd ../eval
-  make DESTDIR="${pkgdir}" install
-  cd ../draw
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../gb.component \
-    ${pkgdir}/usr/lib/gambas3
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
-  gbc/gbi3 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 mime/* \
-    ${pkgdir}/usr/share/gambas3/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
-  install -D -m644 mime/application-x-gambas3.png \
-    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
-  make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
-  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
-           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
-           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
-  pkgdesc="Integrated Development Environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
-    ${pkgdir}/usr/share/applications/gambas3.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
-    ${pkgdir}/usr/share/pixmaps/gambas3.png
-
-  rm -r ${pkgdir}/usr/bin/gb*
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
-  depends=('gambas3-devel')
-  pkgdesc="Scripter and server programs support"
-  install=gambas3-script.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
-  ##
-
-  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
-           'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
-           'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
-           'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-           'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
-  depends=('gambas3-runtime' 'cairo')
-  pkgdesc="Cairo component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-chart() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Chart component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-form() {
-  depends=('gambas3-gb-db' 'gambas3-gb-form')
-  pkgdesc="Database form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-mysql() {
-  depends=('gambas3-gb-db' 'libmysqlclient')
-  pkgdesc="MySQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-odbc() {
-  depends=('gambas3-gb-db' 'unixodbc')
-  pkgdesc="ODBC database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-postgresql() {
-  depends=('gambas3-gb-db' 'postgresql-libs')
-  pkgdesc="PostgreSQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite2() {
-  depends=('gambas3-gb-db' 'sqlite2')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite3() {
-  depends=('gambas3-gb-db' 'sqlite3')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-desktop() {
-  depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-eval-highlight() {
-  depends=('gambas3-runtime')
-  pkgdesc="Expression evaluator highlight component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-dialog() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form dialog component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-mdi() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form MDI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-stock() {
-  depends=('gambas3-runtime')
-  pkgdesc="Default stock icons component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  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]*}
-  ##
-}
-
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-effect() {
-  depends=('gambas3-gb-image')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-imlib() {
-  depends=('gambas3-gb-image' 'imlib2')
-  pkgdesc="Imlib component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image-io() {
-  depends=('gambas3-gb-image' 'gdk-pixbuf2')
-  pkgdesc="Input/Output component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net() {
-  depends=('gambas3-runtime')
-  pkgdesc="Network component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-curl() {
-  depends=('gambas3-gb-net' 'curl')
-  pkgdesc="Curl component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'libgl' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glu() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GL Utility component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glsl() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GLSL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-option() {
-  depends=('gambas3-runtime')
-  pkgdesc="Getopt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
-  ##
-}
-
-package_gambas3-gb-pcre() {
-  depends=('gambas3-runtime' 'pcre')
-  pkgdesc="PCRE component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-pdf() {
-  depends=('gambas3-runtime' 'poppler')
-  pkgdesc="PDF component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-ext() {
-  depends=('gambas3-gb-qt4')
-  pkgdesc="Qt4 toolkit extended component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-opengl() {
-  depends=('gambas3-gb-qt4' 'libgl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4' 'qtwebkit')
-  pkgdesc="Qt4 toolkit webkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-report() {
-  depends=('gambas3-gb-form' 'gambas3-gb-image-io')
-  pkgdesc="Report component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-sdl-sound() {
-  depends=('gambas3-runtime' 'sdl_mixer')
-  pkgdesc="SDL sound component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-settings() {
-  depends=('gambas3-runtime')
-  pkgdesc="Setting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
-  ##
-}
-
-package_gambas3-gb-signal() {
-  depends=('gambas3-runtime')
-  pkgdesc="Signal component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
-  ##
-}
-
-package_gambas3-gb-v4l() {
-  depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
-  pkgdesc="Video4linux component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-vb() {
-  depends=('gambas3-runtime')
-  pkgdesc="VB transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
-  ##
-}
-
-package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-web() {
-  depends=('gambas3-runtime')
-  pkgdesc="CGI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-staging/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-staging/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/goldendict/PKGBUILD b/community-staging/goldendict/PKGBUILD
deleted file mode 100644
index edab6800d..000000000
--- a/community-staging/goldendict/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57160 2011-10-22 17:43:27Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox@gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
-license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \
-        $pkgname-paths.diff)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
-            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
-
-build(){
-  cd ${srcdir}
-
-  patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-
-  qmake
-  make
-  qmake
-}
-
-package() {
-  cd ${srcdir}
-
-  make INSTALL_ROOT=${pkgdir} install
-
-  #removing unneeded
-  rm -rf ${pkgdir}/usr/share/app-install
-}
diff --git a/community-staging/goldendict/goldendict-paths.diff b/community-staging/goldendict/goldendict-paths.diff
deleted file mode 100644
index 812dfdb97..000000000
--- a/community-staging/goldendict/goldendict-paths.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- goldendict.pro~	2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro	2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
--    isEmpty( PREFIX ):PREFIX = /usr/local
--    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+    isEmpty( PREFIX ):PREFIX = /usr
-+    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
--    locale.path = $$PREFIX/share/apps/goldendict/locale/
-+    locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/community-staging/goldendict/goldendict.changelog b/community-staging/goldendict/goldendict.changelog
deleted file mode 100644
index 8ec311fe1..000000000
--- a/community-staging/goldendict/goldendict.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community] in v0.9.0
diff --git a/community-staging/google-gadgets/PKGBUILD b/community-staging/google-gadgets/PKGBUILD
deleted file mode 100644
index 870e8dc59..000000000
--- a/community-staging/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 57164 2011-10-22 18:51:22Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
-             'desktop-file-utils' 'xdg-utils'
-             'librsvg' 'curl' 'libsoup-gnome'
-             'qt'
-             'networkmanager'
-             'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
-	"wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
-         'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Building thrice is expensive;
-  #   we move files around instead
-  #
-  # xulrunner 2.0 is incompatible;
-  #   we build without smjs-script/browser-element
-
-  patch -p1 <$srcdir/wifi-types.patch
-  ./configure --prefix=/usr \
-              --disable-werror \
-              --disable-update-desktop-database \
-              --disable-update-mime-database \
-              --with-oem-brand=Arch \
-              --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
-              --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
-              --disable-gtkmoz-browser-element \
-              --disable-smjs-script-runtime
-  make
-}
-
-package_google-gadgets-common() {
-  pkgdesc="Desktop widgets from Google (common files)"
-  install=$pkgbase-common.install
-  depends=('hicolor-icon-theme' 'shared-mime-info')
-  optdepends=('google-gadgets-gtk: GTK+ (full) UI'
-              'google-gadgets-qt: Qt (partial) UI')
-
-  cd "$srcdir/$_realname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-
-  # we need to remove stuff in this package
-  cp -a "$pkgdir" "$_basedir"
-
-  # do not force any removal; we want to know in case files change
-  cd "$pkgdir/usr"
-  rm -r bin
-  rm -r share/applications
-
-  cd "$pkgdir/usr/lib/$pkgbase"
-
-  # gtk-related
-  #rm gtkmoz-browser-child
-  rm ../lib*gtk*
-  rm modules/gtk*.so
-
-  # qt-related
-  rm ../lib*qt*
-  rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
-  pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
-           'librsvg' 'curl')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the gtk binary
-  cd "$_basedir"
-  install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
-  # gtk-only browser stuff
-  #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
-  #  "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
-  # now the gtk libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/gtk*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
-  # freedesktop.org for gtk
-  install -Dm644 usr/share/applications/ggl-gtk.desktop \
-    "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
-  install -m644 usr/share/applications/ggl-designer.desktop \
-    "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
-  pkgdesc="Desktop widgets from Google (partial Qt front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common' 'qt'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the qt binary
-  cd "$_basedir"
-  install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
-  # the qt libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/qt*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
-  # freedesktop.org for qt
-  install -Dm644 usr/share/applications/ggl-qt.desktop \
-    "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/google-gadgets-common.install b/community-staging/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-staging/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  gtk-update-icon-cache --quiet usr/share/icons/hicolor
-  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/community-staging/google-gadgets/google-gadgets.changelog b/community-staging/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-staging/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.11.2-3:
-	xulrunner rebuild
-		- undepend on xulrunner (2.0 incompatible)
-		- disable smjs-script/browser-element
-	Cleaned up scriptlets (too many blank lines)
-	Added this changelog
diff --git a/community-staging/google-gadgets/google-gadgets.install b/community-staging/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-staging/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/wifi-types.patch b/community-staging/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-staging/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc	2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc	2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
- 
- static const int kDeviceTypeUnknown = 0;
- 
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc	2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc	2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
- 
- using namespace ggadget::dbus;
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-staging/gpsbabel/PKGBUILD b/community-staging/gpsbabel/PKGBUILD
deleted file mode 100644
index 467a2d404..000000000
--- a/community-staging/gpsbabel/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 57111 2011-10-21 23:00:10Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gpsbabel
-pkgver=1.4.2
-pkgrel=4
-pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
-url="http://www.gpsbabel.org"
-license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit')
-optdepends=('qt' 'qtwebkit')
-options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
-	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('76ea9f7852be2e98aa18976c4697ca93'
-         '7bdbd243e29a8831842d31c079f04c45')
-
-build() {
-  cd $srcdir/gpsbabel-$pkgver
-  ./configure --prefix=/usr
-  make
-  make doc
-  (cd gui && qmake && make)
-}
-
-package() {
-  cd $srcdir/gpsbabel-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # GUI
-  install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
-  install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
-  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
-
-  # Header install
-  mkdir -p $pkgdir/usr/include/gpsbabel
-  cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
-     $pkgdir/usr/include/gpsbabel
-
-  # Doc install
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
-  cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
-  cp README* $pkgdir/usr/share/doc/$pkgname/
-}
diff --git a/community-staging/kadu/PKGBUILD b/community-staging/kadu/PKGBUILD
deleted file mode 100644
index 3865d1aae..000000000
--- a/community-staging/kadu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57138 2011-10-22 11:49:58Z bpiotrowski $
-# Maintainer: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=2
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
-  cd $srcdir/kadu-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/kadu-$pkgver
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
-  rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
-}
diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD
deleted file mode 100644
index 9eab1adac..000000000
--- a/community-staging/kvirc/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 57113 2011-10-21 23:00:54Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=kvirc
-pkgver=4.0.4
-pkgrel=4
-pkgdesc="Qt-based IRC client"
-url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
-makedepends=('cmake')
-license=('GPL')
-options=("!libtool")
-install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788')
-
-build() {
-  cd $srcdir/kvirc-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/kvirc/kvirc.install b/community-staging/kvirc/kvirc.install
deleted file mode 100644
index 8f76d007f..000000000
--- a/community-staging/kvirc/kvirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-  true
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-  true
-}
diff --git a/community-staging/libraw/PKGBUILD b/community-staging/libraw/PKGBUILD
deleted file mode 100644
index c37c8e9a0..000000000
--- a/community-staging/libraw/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57457 2011-10-28 07:42:04Z lcarlier $
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=libraw
-_pkgbasename=LibRaw
-pkgver=0.14.3
-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')
-url="http://www.libraw.org/"
-license=('CDDL' 'LGPL' 'custom')
-depends=('lcms')
-options=('!makeflags')
-source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57')
-
-build() {
-  	cd ${srcdir}/${_pkgbasename}-${pkgver}
-  
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-  	cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  	make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
deleted file mode 100644
index 3f3b363bf..000000000
--- a/community-staging/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57156 2011-10-22 16:03:24Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=3
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  if [ ${CARCH} = i686 ]; then
-    sed -i 's/ -msse2//' project.pro
-  fi
-
-  lrelease project.pro
-  qmake PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 378053ef5..000000000
--- a/community-staging/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,33 +0,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/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD
deleted file mode 100644
index d9ee4955a..000000000
--- a/community-staging/mythtv/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 57173 2011-10-23 02:45:26Z 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.24.1
-pkgrel=3
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
-         'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python'
-	 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt'
-	 'qtwebkit' 'wget')
-makedepends=('yasm')
-optdepends=('xmltv: to download tv listings')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'mythbackend.rc'
-        'mythbackend.conf'
-        'mythtv-v4l2-fix.patch'
-	'build.patch')
-md5sums=('6870c679619ec58456e76839745411d8'
-         'feadcc9ad064d93d6dceab1efc0bd9ed'
-         'bb8e4033d82428d827570fae9ba15e6a'
-         'ba5c91df80f0d3f7563a873e71a3725c'
-	 '3188962917e98c4e07818dccd64bc423')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch
-  patch -Np1 -i ${srcdir}/build.patch
-
-  ARCH="${CARCH/_/-}"
-  ./configure --prefix=/usr --cpu="$ARCH" \
-              --enable-mmx \
-              --enable-audio-oss \
-              --enable-audio-alsa \
-              --disable-audio-jack \
-              --enable-audio-pulse \
-              --disable-altivec \
-              --disable-distcc \
-              --disable-ccache \
-              --enable-vdpau \
-              --enable-dvb \
-              --dvb-path=/usr/include \
-              --enable-lirc \
-              --enable-joystick-menu \
-              --enable-v4l \
-              --enable-ivtv \
-              --enable-xvmc \
-              --enable-xvmcw \
-              --enable-xvmc-vld \
-              --enable-firewire \
-              --enable-opengl-vsync \
-              --enable-xrandr \
-              --enable-xv \
-              --enable-x11 \
-              --with-bindings=perl,python \
-              --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 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
-  mkdir -p "$pkgdir/usr/share/mythtv"
-  cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-}
diff --git a/community-staging/mythtv/build.patch b/community-staging/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community-staging/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp	2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp	2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
- 
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
- 
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community-staging/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-#    /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community-staging/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
-    . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890 
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
-    start)
-	stat_busy "Starting MythTV Backend"
-
-	# already running ?
-	if [[ "${pid}" -gt  0 ]] && kill -0 "${pid}"; then
-	    stat_fail
-	    exit 1;
-	fi	    
-	touch ${PIDFILE} ${LOG_FILE}
-	chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
-	if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
-	--daemon \
-        --logfile $LOG_FILE $LOG_OPTS \
-        --pidfile ${PIDFILE} $MBE_OPTIONS"; 
-	then
-	    add_daemon mythbackend
-	    stat_done
-	else
-	    stat_fail
-	fi
-	;;
-    
-    stop)
-	stat_busy "Stopping MythTV Backend"
-	if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
-	    rm_daemon mythbackend
-	    stat_done
-	    rm ${PIDFILE} 2>/dev/null
-	else
-	    stat_fail
-	fi
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/mythtv/mythtv-v4l2-fix.patch b/community-staging/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community-staging/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
-   --disable-iptv           disable support for recording RTSP/UDP/RTP streams
-   --disable-hdhomerun      disable support for HDHomeRun boxes
-   --disable-v4l            disable Video4Linux support
--  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l support
-+  --disable-v4l2           disable Video4Linux2 support
-+  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l2 support
-   --disable-hdpvr          disable HD-PVR support
-   --disable-dvb            disable DVB support
-   --dvb-path=HDRLOC        location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
-     qtwebkit
-     quartz_video
-     v4l
-+    v4l2
-     valgrind
-     x11
-     xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
-         fi
-         disable opengl_vsync
-         disable v4l
-+        disable v4l2
-         disable x11
-         # Workaround compile errors from missing gmtime_r/localtime_r/uint def
-         CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
-         fi
-         disable symver
-         disable v4l
-+        disable v4l2
-         enable  windows
-         disable x11
-         ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
- 
- if enabled backend; then
-   echo "Video4Linux sup.          ${v4l-no}"
-+  echo "Video4Linux2 sup.         ${v4l2-no}"
-   echo "ivtv support              ${ivtv-no}"
-   echo "HD-PVR support            ${hdpvr-no}"
-   echo "FireWire support          ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- #include "go7007_myth.h"
- 
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else  // USING_V4l
-+#else  // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
- 
- #define KEYFRAMEDIST   30
- 
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
- 
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     usingv4l2 = true;
- 
-     struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
-     QString driver = (char *)vcap.driver;
-     if (driver == "go7007")
-         go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
-         audio_device->Close();
- }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
-     NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
-         act_text_buffer = 0;
-     textbuffer[act]->freeToEncode = 1;
- }
--#else  // USING_V4L
-+#else  // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
-     //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
- 
--#else  // USING_V4L
-+#else  // USING_V4L 
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
- 
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
- 
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-     }
-     else
-     {
-+#ifdef USING_V4L
-         struct video_tuner tuner;
-         bzero(&tuner, sizeof(tuner));
- 
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-         {
-             isLocked = tuner.signal;
-         }
-+#endif
-     }
- 
-     {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
- 
- #include <algorithm>
- 
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
- 
-@@ -28,6 +28,8 @@
- 
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
-     (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     struct v4l2_capability vcap;
-     bzero(&vcap, sizeof(vcap));
- 
-     return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
-             (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
-     return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
- 
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
-     if (videofd < 0)
-         return false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     // First try V4L2 query
-     struct v4l2_capability capability;
-     bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
-     }
-     else // Fallback to V4L1 query
-     {
-+#ifdef USING_V4L
-         struct video_capability capability;
-         if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
-             card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
-     }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- 
-     if (!driver.isEmpty())
-         driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-     InputNames list;
-     ok = false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
-     // V4L v2 query
-     struct v4l2_input vin;
-     bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-         ok = true;
-         return list;
-     }
-+#endif
- 
-     // V4L v1 query
-+#ifdef USING_V4L
-     struct video_capability vidcap;
-     bzero(&vidcap, sizeof(vidcap));
-     if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- 
-         list[i] = test.name;
-     }
--
-+#endif
-     // Create an input on single input cards that don't advertise input
-     if (!list.size())
-         list[0] = "Television";
- 
-     ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
-     list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-     return list;
- }
- 
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
- 
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
-         channel = new DVBChannel(device);
- #endif
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (("V4L" == card_type) || ("MPEG" == card_type))
-         channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
-     cardTypes += "'DVB'";
- #endif // USING_DVB
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (!cardTypes.isEmpty())
-         cardTypes += ",";
-     cardTypes += "'V4L'";
- # ifdef USING_IVTV
-     cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_IPTV
-     if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
- 
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
-     HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
-     HEADERS += vbitext/vbi.h vbitext/vt.h
-     SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
-     SOURCES += channelchangemonitor.cpp
- 
-     # Support for Video4Linux devices
--    using_v4l {
-+    using_v4l || using_v4l2 {
-         HEADERS += v4lchannel.h                analogsignalmonitor.h
-         SOURCES += v4lchannel.cpp              analogsignalmonitor.cpp
- 
--        DEFINES += USING_V4L
-+        using_v4l {
-+            DEFINES += USING_V4L
-+        }
-+
-+        using_v4l2 {
-+            DEFINES += USING_V4L2
-+        }
-     }
- 
-     # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- #   include "dvbchannel.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #   include "analogsignalmonitor.h"
- #   include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
-     }
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     if ((cardtype.toUpper() == "HDPVR"))
-     {
-         V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
- 
- #include "channelgroup.h"
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
- 
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
-     }
-     else // "V4L" or "MPEG", ie, analog TV
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         channel = new V4LChannel(this, genOpt.videodev);
-         if (!channel->Open())
-             return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
-     }
-     else
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         // V4L/MJPEG/GO7007 from here on
-         recorder = new NuppelVideoRecorder(this, channel);
-         recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-     }
- 
-     if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
- 
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
-                                   channel->GetCurrentName());
-     }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (GetV4LChannel())
-     {
-         channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-     {
-         if (fmt == "NTSC-JP")
-             return 6;
-+#ifdef USING_V4L
-         else if (fmt.left(5) == "SECAM")
-             return VIDEO_MODE_SECAM;
-+#endif
-         else if (fmt == "PAL-NC")
-             return 3;
-         else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt == "PAL-N")
-             return 5;
-         // generics...
-+#ifdef USING_V4L
-         else if (fmt.left(3) == "PAL")
-             return VIDEO_MODE_PAL;
-         else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt.left(4) == "ATSC")
-             return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
-         return VIDEO_MODE_NTSC;
-+#endif 
-     }
- 
-     VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
-     }
-     else if (1 == v4l_version)
-     {
-+#ifdef USING_V4L    
-         if (mode == VIDEO_MODE_NTSC)
-             return "NTSC";
-         else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
-             return "PAL-N";
-         else if (mode == 6)
-             return "NTSC-JP";
-+#endif
-     }
-     else
-     {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-         return true;
-     }
- 
-+#ifdef USING_V4L
-     // Video4Linux version 1 tuning
-     uint freq = frequency / 62500;
-     ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-                 .arg(device).arg(ioctlval).arg(strerror(errno)));
-         return false;
-     }
-+#endif
- 
-     SetSIStandard(si_std);
- 
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- 
-     if (usingv4l1)
-     {
-+#ifdef USING_V4L
-         VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
- 
-         // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-         {
-             VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                     "\n\t\t\twhile setting format (v4l v1)" + ENO);
--        }
--        else if (usingv4l2)
-+        } else
-+#endif
-+        if (usingv4l2)
-         {
-             VERBOSE(VB_IMPORTANT, LOC + msg +
-                     "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
-     return ok;
- }
- 
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
-     int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
-     }
-     return NULL;
- }
-+#endif
- 
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-     }
- 
-     // V4L1
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-         VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
-         return false;
-     }
--
-+#endif
-     return true;
- }
- 
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
- 
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
- 
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
-     unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
-     if (setfield)
-         return *setfield;
-+#endif
- 
-     return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- 
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-         // ???
-         return -1;
-     }
--
-+#endif
-     return 0;
- }
- 
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
- 
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
- 
- using namespace std;
- 
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- //       compiling with -std=c99.  We could remove this in the .pro file,
- //       but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size;                // its current size
- 
- 
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
- 
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
-     setTrigger(cardtype);
-     setSaveAll(false);
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     addTarget("V4L",       new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
-     addTarget("MPEG",      new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
-     addTarget("HDPVR",     new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     addTarget("DVB",       new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
- 
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("Analog V4L capture card"), "V4L");
-     setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
-     setting->addSelection(
-         QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
-         QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
-         "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_HDHOMERUN
-     setting->addSelection(
diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community-staging/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
-	return
-}
-
-post_remove() {
-   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community-staging/paraview/PKGBUILD b/community-staging/paraview/PKGBUILD
deleted file mode 100644
index 38e3fab49..000000000
--- a/community-staging/paraview/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.10.1
-pkgrel=3
-pkgdesc='Parallel Visualization Application using VTK.'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' 
-makedepends=('cmake' 'desktop-file-utils')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
-        'paraview.png'
-        'paraview.desktop'
-        'fixkernelversioncheck.diff')
-md5sums=('d8a9d4a997a720589ffd57568bcdd449'
-         'db623002bc71a257ddfdd0c9c7b14c3f'
-         '4e4b7172ed18171c37446fd7c4f1e8f5'
-         '9e137af23701f76fc727222ebac23389')
-
-build() {
-  cd ParaView-${pkgver}
-
-  # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  cd VTK
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-  cd ..
-
-  sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx
-  sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx
-  sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx
-
-  # Paraview wants to be built out of source
-  mkdir -p build
-  cd build
-
-  # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_USE_PTHREADS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_SKIP_RPATH:BOOL=YES \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-    -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DBUILD_DOCUMENTATION:BOOL=OFF \
-    -DBUILD_EXAMPLES:BOOL=OFF \
-    -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-    -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=OFF \
-    -DVTK_USE_OFFSCREEN=TRUE \
-    -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-    -DPARAVIEW_USE_MPI:BOOL=ON \
-    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
-    ..
-
-  make
-}
-
-package() {
-  cd ParaView-${pkgver}/build
-
-  make DESTDIR=${pkgdir} install
-
-  # Install license
-  install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
-  # Install desktop shortcuts
-  install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
-  desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-
-  # Removes VTK plugin for designer - if you need, you can install vtk
-  #rm -rf ${pkgdir}/opt/paraview/plugins
-}
diff --git a/community-staging/paraview/fixkernelversioncheck.diff b/community-staging/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/paraview/paraview.desktop b/community-staging/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-staging/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-staging/paraview/paraview.png b/community-staging/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-staging/paraview/paraview.png
+++ /dev/null
diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD
deleted file mode 100644
index 555de294c..000000000
--- a/community-staging/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python2: needed for search'
-            'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('093bb1f7779378a339c20aa3e4ea6d36')
-
-build() {
-  cd qbittorrent-${pkgver}
-
-  sed -i \
-    -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find ./ -name '*.py')
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd qbittorrent-${pkgver}
-
-  make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-staging/qmc2/PKGBUILD b/community-staging/qmc2/PKGBUILD
deleted file mode 100644
index 6f94c41ac..000000000
--- a/community-staging/qmc2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57115 2011-10-21 23:01:43Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=qmc2
-pkgver=0.2.b20
-pkgrel=2
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME."
-url="http://qmc2.arcadehits.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qt' 'phonon' 'sdl' 'libxmu' 'qtwebkit')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2")
-md5sums=('e868144815ff44a2146e839c2395c6d1')
-
-build() {
-  cd "$srcdir/$pkgname"
-  export CTIME=0
-  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/usr/share/{applications,pixmaps}
-  install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
-}
diff --git a/community-staging/qtcreator/PKGBUILD b/community-staging/qtcreator/PKGBUILD
deleted file mode 100644
index ab30a1577..000000000
--- a/community-staging/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 57122 2011-10-22 02:45:08Z 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.3.1
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt>=4.7.4')
-makedepends=('qt-private-headers>=4.7.4' 'git')
-options=('docs')
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
-        'qtcreator.desktop')
-md5sums=('8aa296ed9034f847bd53ee0424e5ef08'
-         'f1f4680b9838ff0b8f4cf11eb850d662')
-
-build() {
-  cd ${srcdir}
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
-  make
-}
-
-package() {
-  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')
-  
-  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-staging/qtcreator/qtcreator.desktop b/community-staging/qtcreator/qtcreator.desktop
deleted file mode 100644
index 0fd562bd9..000000000
--- a/community-staging/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-staging/shotwell/PKGBUILD b/community-staging/shotwell/PKGBUILD
deleted file mode 100644
index 635643525..000000000
--- a/community-staging/shotwell/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 57463 2011-10-28 09:01:56Z 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.11.4
-pkgrel=5
-pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('i686' 'x86_64')
-url="http://yorba.org/shotwell/"
-license=('LGPL2.1')
-depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
-	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'vala')
-install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
-	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
-	"build-hack.patch")
-md5sums=('150899574f8fd96b6a5b87173a6ef3e0'
-         'bf35262cc611de447147d01cbac33767'
-         'afc8657b3fb3803d40f5e621e7857af8')
-
-build() {
-  cd "${srcdir}/vala-0.12.1"
-  ./configure --prefix=$srcdir/vala --enable-vapigen
-  make
-  make install
-  export PATH=$srcdir/vala/bin:$PATH
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-	--disable-schemas-install \
-	--disable-desktop-update \
-	--disable-icon-update
-  # hack
-  make || true
-  patch -p1 <$srcdir/build-hack.patch
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
-}
diff --git a/community-staging/shotwell/build-hack.patch b/community-staging/shotwell/build-hack.patch
deleted file mode 100644
index 8c65f6a8f..000000000
--- a/community-staging/shotwell/build-hack.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -wbBur shotwell-0.11.4/src/photos/GRaw.c shotwell-0.11.4.my/src/photos/GRaw.c
---- shotwell-0.11.4/src/photos/GRaw.c	2011-10-28 12:44:04.000000000 +0400
-+++ shotwell-0.11.4.my/src/photos/GRaw.c	2011-10-28 12:41:48.000000000 +0400
-@@ -210,7 +210,7 @@
- };
- GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options);
- GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options);
--void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
-+//void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
- void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error);
- void graw_processor_document_mode_processing (GRawProcessor* self, GError** error);
- libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self);
-@@ -223,7 +223,7 @@
- void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error);
- void graw_processor_process (GRawProcessor* self, GError** error);
- void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error);
--void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
-+//void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
- void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error);
- void graw_processor_recycle (GRawProcessor* self);
- void graw_processor_unpack (GRawProcessor* self, GError** error);
-@@ -677,12 +677,12 @@
- 	return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
- }
- 
--
-+#if 0
- void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self) {
- 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
- 	libraw_add_masked_borders_to_bitmap (self->priv->proc);
- }
--
-+#endif
- 
- void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) {
- 	enum LibRaw_errors _tmp0_;
-@@ -909,7 +909,7 @@
- 	}
- }
- 
--
-+#if 0
- void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error) {
- 	enum LibRaw_errors _tmp0_;
- 	GError * _inner_error_ = NULL;
-@@ -927,7 +927,7 @@
- 		}
- 	}
- }
--
-+#endif
- 
- void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) {
- 	enum LibRaw_errors _tmp0_;
-@@ -1044,8 +1044,8 @@
- 	(*_tmp8_).use_camera_matrix = TRUE;
- 	_tmp9_ = graw_processor_get_output_params (self);
- 	(*_tmp9_).output_color = (gint) GRAW_COLORSPACE_SRGB;
--	_tmp10_ = graw_processor_get_output_params (self);
--	(*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
-+//	_tmp10_ = graw_processor_get_output_params (self);
-+//	(*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- 	_tmp11_ = graw_processor_get_output_params (self);
- 	(*_tmp11_).output_bps = 8;
- 	_tmp12_ = graw_processor_get_output_params (self);
-@@ -1356,6 +1356,7 @@
- 				return;
- 			}
- 		}
-+#if 0
- 		case LIBRAW_CANNOT_ADDMASK:
- 		{
- 			GError* _tmp10_ = NULL;
-@@ -1372,6 +1373,7 @@
- 				return;
- 			}
- 		}
-+#endif
- 		case LIBRAW_UNSUFFICIENT_MEMORY:
- 		{
- 			GError* _tmp11_ = NULL;
diff --git a/community-staging/shotwell/shotwell.install b/community-staging/shotwell/shotwell.install
deleted file mode 100644
index bab8ecd29..000000000
--- a/community-staging/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-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD
deleted file mode 100644
index 0b61ea9bf..000000000
--- a/community-staging/sigil/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 57149 2011-10-22 15:18:04Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.4.2
-pkgrel=2
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64') 
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-makedepends=('cmake')
-install=sigil.install
-source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip
-        ${pkgname}.desktop)
-md5sums=('ce27976254236f8b11b787fd05be9acb'
-         'fef6aa492af487ccccd6b133635cee5a')
-
-build() {
-  cd "${srcdir}"
-  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
-}
diff --git a/community-staging/sigil/sigil.desktop b/community-staging/sigil/sigil.desktop
deleted file mode 100755
index 4f3a14d20..000000000
--- a/community-staging/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community-staging/texmaker/PKGBUILD b/community-staging/texmaker/PKGBUILD
deleted file mode 100644
index 7db874e08..000000000
--- a/community-staging/texmaker/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com> 
-# Contributor: Firmicus <firmicus gmx net> 
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.1
-pkgrel=2
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
-
-build() {
-	cd ${pkgname}-${pkgver}
-
-	export INSTALL_ROOT=${pkgdir}
-
-	qmake -unix PREFIX=//usr texmaker.pro
-
-	make
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-
-	export INSTALL_PATH=${pkgdir}
-
-	make install
-}
diff --git a/community-staging/vtk/PKGBUILD b/community-staging/vtk/PKGBUILD
deleted file mode 100644
index 7f17b62cd..000000000
--- a/community-staging/vtk/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=3
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
-            'java-runtime: java bindings'
-            'tk: tcl bindings'
-            'gnuplot: plotting tools'
-            'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
-         'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389')
-
-build() {
-  cd VTK
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake \
-    -Wno-dev \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
-    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
-    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-    -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
-    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
-    -DVTK_WRAP_JAVA:BOOL=ON \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
-    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    ${srcdir}/VTK
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/vtk
-  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
-    ${pkgdir}/usr/share/java/vtk
-
-  # Install license
-  install -dv ${pkgdir}/usr/share/licenses/vtk
-  install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/vtk
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community-staging/vtk/fixkernelversioncheck.diff b/community-staging/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/wkhtmltopdf/PKGBUILD b/community-staging/wkhtmltopdf/PKGBUILD
deleted file mode 100644
index ba585ae29..000000000
--- a/community-staging/wkhtmltopdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57150 2011-10-22 15:18:09Z andrea $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-
-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')
-url="http://code.google.com/p/wkhtmltopdf/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  qmake wkhtmltopdf.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir/usr" install
-
-  # Generate and install man page
-  install -d "$pkgdir/usr/share/man/man1"
-  ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-}
diff --git a/community-testing/acetoneiso2/PKGBUILD b/community-testing/acetoneiso2/PKGBUILD
deleted file mode 100644
index 9e0bb04cd..000000000
--- a/community-testing/acetoneiso2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Wes Brewer <brewerw@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=acetoneiso2
-pkgver=2.3
-pkgrel=3
-pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)"
-arch=('i686' 'x86_64')
-url="http://www.acetoneteam.org"
-license=('GPL3')
-depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon')
-optdepends=("p7zip: for ISO compress/decompress support")
-conflicts=('acetoneiso')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz)
-md5sums=('225f7af687016690ff28b9771a1ce179')
-
-build() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	qmake
-	# needed for phonon
-	sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile
-	make
-}
-
-package() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-testing/acetoneiso2/acetoneiso2.install b/community-testing/acetoneiso2/acetoneiso2.install
deleted file mode 100644
index 1a3984e24..000000000
--- a/community-testing/acetoneiso2/acetoneiso2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-cat << EOF
-  -->
-  -->  Please remember to add 'fuse' to your MODULES array in /etc/rc.conf
-  -->
-EOF
-}
-
-post_upgrade() {
-    post_install $*
-}
diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD
deleted file mode 100644
index 8e5412cd3..000000000
--- a/community-testing/cdfs/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57350 2011-10-26 12:09:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-
-pkgname=cdfs
-pkgver=2.6.27
-pkgrel=17
-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.0.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef')
-
-build() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.0.patch
-  make KDIR=/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
-}
diff --git a/community-testing/cdfs/cdfs-3.0.0.patch b/community-testing/cdfs/cdfs-3.0.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/community-testing/cdfs/cdfs-3.0.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install
deleted file mode 100644
index 3693d60ed..000000000
--- a/community-testing/cdfs/cdfs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  /sbin/depmod -a
-}
-
-post_upgrade() {
-  /sbin/depmod -a
-}
-
-post_remove() {
-  /sbin/depmod -a
-}
diff --git a/community-testing/clipgrab/PKGBUILD b/community-testing/clipgrab/PKGBUILD
deleted file mode 100644
index df3c57383..000000000
--- a/community-testing/clipgrab/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: thacrazze <thacrazze|googlemail|com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=clipgrab
-pkgver=3.1.0.2
-pkgrel=2
-pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
-arch=('i686' 'x86_64')
-url='http://clipgrab.de/'
-license=('GPL')
-depends=('qt' 'qtwebkit')
-optdepends=('ffmpeg: for some encodings')
-source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop)
-md5sums=('1250e1fb29cd88b7ce1a37d937de0146'
-         'ef030502ae0922e632742f47283313f4'
-         '9a141791f6952917c441050c3dac81ce')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  qmake && make
-}
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm755 ${pkgname} $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/clipgrab/clipgrab.desktop b/community-testing/clipgrab/clipgrab.desktop
deleted file mode 100644
index dad31cfdd..000000000
--- a/community-testing/clipgrab/clipgrab.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=ClipGrab
-GenericName=Video Downloader
-GenericName[de]=Video-Downloader
-Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
-Icon=/usr/share/pixmaps/clipgrab.png
-Exec=clipgrab
-TryExec=clipgrab
-Terminal=false
-Categories=Qt;AudioVideo;Audio;Video;
diff --git a/community-testing/clipgrab/clipgrab.png b/community-testing/clipgrab/clipgrab.png
deleted file mode 100644
index 2573fed20..000000000
--- a/community-testing/clipgrab/clipgrab.png
+++ /dev/null
diff --git a/community-testing/expac/PKGBUILD b/community-testing/expac/PKGBUILD
deleted file mode 100644
index ff83247d7..000000000
--- a/community-testing/expac/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 56821 2011-10-13 19:47:47Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
-
-pkgname=expac
-pkgver=0.07
-pkgrel=1
-pkgdesc="pacman database extraction utility"
-arch=('i686' 'x86_64')
-url="http://github.com/falconindy/expac"
-license=('GPL')
-depends=('pacman')
-makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1bc637b733051827982db12db84643f2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-}
-
-# vim: ft=sh syn=sh
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
deleted file mode 100644
index b1f6021ac..000000000
--- a/community-testing/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57223 2011-10-24 20:32:21Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.1.3
-pkgrel=6
-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' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('asio' 'cmake')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('6d4a00cdd0b59a05b1521184508d4637')
-
-build() {
-  cd $pkgname-$pkgver
-
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
deleted file mode 100644
index 517c91293..000000000
--- a/community-testing/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 57225 2011-10-24 20:32:33Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
-         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
-         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
-         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
-         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.5
-pkgrel=2
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('dfa16f5208463e81ba8ca801948c353a'
-         'b284be39d147ec799f1116a6abc068b4'
-         'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  ./reconf-all
-  ./configure --prefix=/usr -C
-
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make DESTDIR="${pkgdir}" install
-  cd ../eval
-  make DESTDIR="${pkgdir}" install
-  cd ../draw
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../gb.component \
-    ${pkgdir}/usr/lib/gambas3
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
-  gbc/gbi3 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 mime/* \
-    ${pkgdir}/usr/share/gambas3/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
-  install -D -m644 mime/application-x-gambas3.png \
-    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
-  make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
-  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
-           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
-           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
-  pkgdesc="Integrated Development Environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
-    ${pkgdir}/usr/share/applications/gambas3.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
-    ${pkgdir}/usr/share/pixmaps/gambas3.png
-
-  rm -r ${pkgdir}/usr/bin/gb*
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
-  depends=('gambas3-devel')
-  pkgdesc="Scripter and server programs support"
-  install=gambas3-script.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
-  ##
-
-  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
-           'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
-           'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
-           'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-           'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
-  depends=('gambas3-runtime' 'cairo')
-  pkgdesc="Cairo component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-chart() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Chart component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-form() {
-  depends=('gambas3-gb-db' 'gambas3-gb-form')
-  pkgdesc="Database form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-mysql() {
-  depends=('gambas3-gb-db' 'libmysqlclient')
-  pkgdesc="MySQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-odbc() {
-  depends=('gambas3-gb-db' 'unixodbc')
-  pkgdesc="ODBC database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-postgresql() {
-  depends=('gambas3-gb-db' 'postgresql-libs')
-  pkgdesc="PostgreSQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite2() {
-  depends=('gambas3-gb-db' 'sqlite2')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite3() {
-  depends=('gambas3-gb-db' 'sqlite3')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-desktop() {
-  depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-eval-highlight() {
-  depends=('gambas3-runtime')
-  pkgdesc="Expression evaluator highlight component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-dialog() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form dialog component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-mdi() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form MDI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-stock() {
-  depends=('gambas3-runtime')
-  pkgdesc="Default stock icons component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  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]*}
-  ##
-}
-
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-effect() {
-  depends=('gambas3-gb-image')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-imlib() {
-  depends=('gambas3-gb-image' 'imlib2')
-  pkgdesc="Imlib component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image-io() {
-  depends=('gambas3-gb-image' 'gdk-pixbuf2')
-  pkgdesc="Input/Output component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net() {
-  depends=('gambas3-runtime')
-  pkgdesc="Network component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-curl() {
-  depends=('gambas3-gb-net' 'curl')
-  pkgdesc="Curl component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'libgl' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glu() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GL Utility component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glsl() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GLSL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-option() {
-  depends=('gambas3-runtime')
-  pkgdesc="Getopt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
-  ##
-}
-
-package_gambas3-gb-pcre() {
-  depends=('gambas3-runtime' 'pcre')
-  pkgdesc="PCRE component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-pdf() {
-  depends=('gambas3-runtime' 'poppler')
-  pkgdesc="PDF component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-ext() {
-  depends=('gambas3-gb-qt4')
-  pkgdesc="Qt4 toolkit extended component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-opengl() {
-  depends=('gambas3-gb-qt4' 'libgl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4' 'qtwebkit')
-  pkgdesc="Qt4 toolkit webkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-report() {
-  depends=('gambas3-gb-form' 'gambas3-gb-image-io')
-  pkgdesc="Report component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-sdl-sound() {
-  depends=('gambas3-runtime' 'sdl_mixer')
-  pkgdesc="SDL sound component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-settings() {
-  depends=('gambas3-runtime')
-  pkgdesc="Setting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
-  ##
-}
-
-package_gambas3-gb-signal() {
-  depends=('gambas3-runtime')
-  pkgdesc="Signal component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
-  ##
-}
-
-package_gambas3-gb-v4l() {
-  depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
-  pkgdesc="Video4linux component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-vb() {
-  depends=('gambas3-runtime')
-  pkgdesc="VB transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
-  ##
-}
-
-package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-web() {
-  depends=('gambas3-runtime')
-  pkgdesc="CGI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-testing/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-testing/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD
deleted file mode 100644
index be9ad0d28..000000000
--- a/community-testing/gedit-plugins/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 56919 2011-10-16 20:32:19Z ibiru $
-#Maintainer:  Ionut Biru <ibiru@archlinux.org>
-#Contributor: Hugo Doria <hugo@archlinux.org>
-#Contributor: Sergej Chodarev <sergejx@centrum.sk>
-#Contributor: zhuqin <zhuqin83@gmail.com>
-
-pkgname=gedit-plugins
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Set of plugins for gedit"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
-optdepends=('gucharmap: for charmap plugin')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \
-      --disable-schemas-compile
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
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/goldendict/PKGBUILD b/community-testing/goldendict/PKGBUILD
deleted file mode 100644
index 7b64f04e8..000000000
--- a/community-testing/goldendict/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57227 2011-10-24 20:32:42Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox@gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
-license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \
-        $pkgname-paths.diff)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
-            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
-
-build(){
-  cd ${srcdir}
-
-  patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-
-  qmake
-  make
-  qmake
-}
-
-package() {
-  cd ${srcdir}
-
-  make INSTALL_ROOT=${pkgdir} install
-
-  #removing unneeded
-  rm -rf ${pkgdir}/usr/share/app-install
-}
diff --git a/community-testing/goldendict/goldendict-paths.diff b/community-testing/goldendict/goldendict-paths.diff
deleted file mode 100644
index 812dfdb97..000000000
--- a/community-testing/goldendict/goldendict-paths.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- goldendict.pro~	2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro	2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
--    isEmpty( PREFIX ):PREFIX = /usr/local
--    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+    isEmpty( PREFIX ):PREFIX = /usr
-+    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
--    locale.path = $$PREFIX/share/apps/goldendict/locale/
-+    locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/community-testing/goldendict/goldendict.changelog b/community-testing/goldendict/goldendict.changelog
deleted file mode 100644
index 8ec311fe1..000000000
--- a/community-testing/goldendict/goldendict.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community] in v0.9.0
diff --git a/community-testing/google-gadgets/PKGBUILD b/community-testing/google-gadgets/PKGBUILD
deleted file mode 100644
index ee3646c7a..000000000
--- a/community-testing/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 57229 2011-10-24 20:32:57Z andrea $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
-             'desktop-file-utils' 'xdg-utils'
-             'librsvg' 'curl' 'libsoup-gnome'
-             'qt'
-             'networkmanager'
-             'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
-	"wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
-         'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Building thrice is expensive;
-  #   we move files around instead
-  #
-  # xulrunner 2.0 is incompatible;
-  #   we build without smjs-script/browser-element
-
-  patch -p1 <$srcdir/wifi-types.patch
-  ./configure --prefix=/usr \
-              --disable-werror \
-              --disable-update-desktop-database \
-              --disable-update-mime-database \
-              --with-oem-brand=Arch \
-              --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
-              --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
-              --disable-gtkmoz-browser-element \
-              --disable-smjs-script-runtime
-  make
-}
-
-package_google-gadgets-common() {
-  pkgdesc="Desktop widgets from Google (common files)"
-  install=$pkgbase-common.install
-  depends=('hicolor-icon-theme' 'shared-mime-info')
-  optdepends=('google-gadgets-gtk: GTK+ (full) UI'
-              'google-gadgets-qt: Qt (partial) UI')
-
-  cd "$srcdir/$_realname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-
-  # we need to remove stuff in this package
-  cp -a "$pkgdir" "$_basedir"
-
-  # do not force any removal; we want to know in case files change
-  cd "$pkgdir/usr"
-  rm -r bin
-  rm -r share/applications
-
-  cd "$pkgdir/usr/lib/$pkgbase"
-
-  # gtk-related
-  #rm gtkmoz-browser-child
-  rm ../lib*gtk*
-  rm modules/gtk*.so
-
-  # qt-related
-  rm ../lib*qt*
-  rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
-  pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
-           'librsvg' 'curl')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the gtk binary
-  cd "$_basedir"
-  install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
-  # gtk-only browser stuff
-  #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
-  #  "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
-  # now the gtk libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/gtk*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
-  # freedesktop.org for gtk
-  install -Dm644 usr/share/applications/ggl-gtk.desktop \
-    "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
-  install -m644 usr/share/applications/ggl-designer.desktop \
-    "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
-  pkgdesc="Desktop widgets from Google (partial Qt front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common' 'qt'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the qt binary
-  cd "$_basedir"
-  install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
-  # the qt libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/qt*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
-  # freedesktop.org for qt
-  install -Dm644 usr/share/applications/ggl-qt.desktop \
-    "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/google-gadgets-common.install b/community-testing/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-testing/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  gtk-update-icon-cache --quiet usr/share/icons/hicolor
-  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/community-testing/google-gadgets/google-gadgets.changelog b/community-testing/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-testing/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.11.2-3:
-	xulrunner rebuild
-		- undepend on xulrunner (2.0 incompatible)
-		- disable smjs-script/browser-element
-	Cleaned up scriptlets (too many blank lines)
-	Added this changelog
diff --git a/community-testing/google-gadgets/google-gadgets.install b/community-testing/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-testing/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/wifi-types.patch b/community-testing/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-testing/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc	2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc	2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
- 
- static const int kDeviceTypeUnknown = 0;
- 
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc	2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc	2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
- 
- using namespace ggadget::dbus;
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-testing/gpsbabel/PKGBUILD b/community-testing/gpsbabel/PKGBUILD
deleted file mode 100644
index d68e1a290..000000000
--- a/community-testing/gpsbabel/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 57231 2011-10-24 20:33:01Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gpsbabel
-pkgver=1.4.2
-pkgrel=4
-pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
-url="http://www.gpsbabel.org"
-license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit')
-optdepends=('qt' 'qtwebkit')
-options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
-	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('76ea9f7852be2e98aa18976c4697ca93'
-         '7bdbd243e29a8831842d31c079f04c45')
-
-build() {
-  cd $srcdir/gpsbabel-$pkgver
-  ./configure --prefix=/usr
-  make
-  make doc
-  (cd gui && qmake && make)
-}
-
-package() {
-  cd $srcdir/gpsbabel-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # GUI
-  install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
-  install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
-  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
-
-  # Header install
-  mkdir -p $pkgdir/usr/include/gpsbabel
-  cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
-     $pkgdir/usr/include/gpsbabel
-
-  # Doc install
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
-  cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
-  cp README* $pkgdir/usr/share/doc/$pkgname/
-}
diff --git a/community-testing/kadu/PKGBUILD b/community-testing/kadu/PKGBUILD
deleted file mode 100644
index d28694770..000000000
--- a/community-testing/kadu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57233 2011-10-24 20:33:05Z andrea $
-# Maintainer: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=2
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
-  cd $srcdir/kadu-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/kadu-$pkgver
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
-  rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
-}
diff --git a/community-testing/kvirc/PKGBUILD b/community-testing/kvirc/PKGBUILD
deleted file mode 100644
index 361089ccb..000000000
--- a/community-testing/kvirc/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 57235 2011-10-24 20:33:11Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=kvirc
-pkgver=4.0.4
-pkgrel=4
-pkgdesc="Qt-based IRC client"
-url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
-makedepends=('cmake')
-license=('GPL')
-options=("!libtool")
-install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788')
-
-build() {
-  cd $srcdir/kvirc-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/kvirc/kvirc.install b/community-testing/kvirc/kvirc.install
deleted file mode 100644
index 8f76d007f..000000000
--- a/community-testing/kvirc/kvirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-  true
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-  true
-}
diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD
deleted file mode 100644
index ed673808d..000000000
--- a/community-testing/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57237 2011-10-24 20:33:19Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=3
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  if [ ${CARCH} = i686 ]; then
-    sed -i 's/ -msse2//' project.pro
-  fi
-
-  lrelease project.pro
-  qmake PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 378053ef5..000000000
--- a/community-testing/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,33 +0,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/musescore/PKGBUILD b/community-testing/musescore/PKGBUILD
deleted file mode 100644
index 642ba03e0..000000000
--- a/community-testing/musescore/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 57239 2011-10-24 20:33:27Z andrea $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
-# Contributor: Cristian Maureira <saint [at] archlinux.cl>
-# Contributor: Dr.Egg <rwhite @ archlinux . us>
-
-pkgname=musescore
-pkgver=1.1
-pkgrel=3
-pkgdesc="A music score editor written in Qt"
-arch=('i686' 'x86_64')
-url="http://www.musescore.org/en/"
-license=('GPL')
-depends=('qt' 'qtwebkit' 'libsndfile' 'qtscriptgenerator')
-makedepends=('cmake' 'doxygen')
-optdepends=('portaudio' 'jack')
-install=musescore.install
-source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
-        'paths.patch')
-md5sums=('68b43af92093a16f7f074c0eb560a867'
-         'e5011154d217f633f21b4bb70e589510')
-
-build() {
-  cd $srcdir/mscore-${pkgver}
-  export QT_PLUGINS_DIR=/usr/lib/qt/plugins
-  [ -d build ] && make clean
-  patch -p1 < $srcdir/paths.patch
-  sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \
-    "$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt
-  sed -i 's+BUILD_SCRIPTGEN TRUE+BUILD_SCRIPTGEN FALSE+' \
-    "$srcdir"/mscore-$pkgver/mscore/CMakeLists.txt
-  sed -i 's+static_cast<const+static_cast<+' \
-    $srcdir/mscore-$pkgver/mscore/mscore/exportxml.cpp
-  make PREFIX=/usr release 
-}
-package() {
-  cd $srcdir/mscore-${pkgver}
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/musescore/musescore.install b/community-testing/musescore/musescore.install
deleted file mode 100644
index d6abb5470..000000000
--- a/community-testing/musescore/musescore.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/musescore/paths.patch b/community-testing/musescore/paths.patch
deleted file mode 100644
index 98bf4b3d5..000000000
--- a/community-testing/musescore/paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp
---- musescore-svn.orig//mscore/mscore/mscore.cpp	2010-06-16 23:10:27.000000000 +0200
-+++ musescore-svn.new//mscore/mscore/mscore.cpp	2010-06-16 23:13:59.000000000 +0200
-@@ -897,15 +897,15 @@
-       if (debugMode)
-             printf("open handbook for language <%s>\n", qPrintable(lang));
- 
--      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+      QFileInfo mscoreHelp(mscoreGlobalShare + QString("../doc/musescore/MuseScore-") + lang + QString(".pdf"));
-       if (!mscoreHelp.isReadable()) {
-             if (debugMode) {
-                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
-                   }
-             lang = lang.left(2);
--            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+            mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-") + lang + QString(".pdf"));
-             if(!mscoreHelp.isReadable()){
--                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
-+                mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-en.pdf"));
-                 if (!mscoreHelp.isReadable()) {
-                       QString info(tr("MuseScore handbook not found at: \n"));
-                       info += mscoreHelp.filePath();
diff --git a/community-testing/mythtv/PKGBUILD b/community-testing/mythtv/PKGBUILD
deleted file mode 100644
index 3808740f3..000000000
--- a/community-testing/mythtv/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 57241 2011-10-24 20:33:41Z andrea $
-# 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.24.1
-pkgrel=3
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
-         'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python'
-	 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt'
-	 'qtwebkit' 'wget')
-makedepends=('yasm')
-optdepends=('xmltv: to download tv listings')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'mythbackend.rc'
-        'mythbackend.conf'
-        'mythtv-v4l2-fix.patch'
-	'build.patch')
-md5sums=('6870c679619ec58456e76839745411d8'
-         'feadcc9ad064d93d6dceab1efc0bd9ed'
-         'bb8e4033d82428d827570fae9ba15e6a'
-         'ba5c91df80f0d3f7563a873e71a3725c'
-	 '3188962917e98c4e07818dccd64bc423')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch
-  patch -Np1 -i ${srcdir}/build.patch
-
-  ARCH="${CARCH/_/-}"
-  ./configure --prefix=/usr --cpu="$ARCH" \
-              --enable-mmx \
-              --enable-audio-oss \
-              --enable-audio-alsa \
-              --disable-audio-jack \
-              --enable-audio-pulse \
-              --disable-altivec \
-              --disable-distcc \
-              --disable-ccache \
-              --enable-vdpau \
-              --enable-dvb \
-              --dvb-path=/usr/include \
-              --enable-lirc \
-              --enable-joystick-menu \
-              --enable-v4l \
-              --enable-ivtv \
-              --enable-xvmc \
-              --enable-xvmcw \
-              --enable-xvmc-vld \
-              --enable-firewire \
-              --enable-opengl-vsync \
-              --enable-xrandr \
-              --enable-xv \
-              --enable-x11 \
-              --with-bindings=perl,python \
-              --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 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
-  mkdir -p "$pkgdir/usr/share/mythtv"
-  cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-}
diff --git a/community-testing/mythtv/build.patch b/community-testing/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community-testing/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp	2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp	2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
- 
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
- 
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community-testing/mythtv/mythbackend.conf b/community-testing/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community-testing/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-#    /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-testing/mythtv/mythbackend.rc b/community-testing/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community-testing/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
-    . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890 
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
-    start)
-	stat_busy "Starting MythTV Backend"
-
-	# already running ?
-	if [[ "${pid}" -gt  0 ]] && kill -0 "${pid}"; then
-	    stat_fail
-	    exit 1;
-	fi	    
-	touch ${PIDFILE} ${LOG_FILE}
-	chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
-	if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
-	--daemon \
-        --logfile $LOG_FILE $LOG_OPTS \
-        --pidfile ${PIDFILE} $MBE_OPTIONS"; 
-	then
-	    add_daemon mythbackend
-	    stat_done
-	else
-	    stat_fail
-	fi
-	;;
-    
-    stop)
-	stat_busy "Stopping MythTV Backend"
-	if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
-	    rm_daemon mythbackend
-	    stat_done
-	    rm ${PIDFILE} 2>/dev/null
-	else
-	    stat_fail
-	fi
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/mythtv/mythtv-v4l2-fix.patch b/community-testing/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community-testing/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
-   --disable-iptv           disable support for recording RTSP/UDP/RTP streams
-   --disable-hdhomerun      disable support for HDHomeRun boxes
-   --disable-v4l            disable Video4Linux support
--  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l support
-+  --disable-v4l2           disable Video4Linux2 support
-+  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l2 support
-   --disable-hdpvr          disable HD-PVR support
-   --disable-dvb            disable DVB support
-   --dvb-path=HDRLOC        location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
-     qtwebkit
-     quartz_video
-     v4l
-+    v4l2
-     valgrind
-     x11
-     xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
-         fi
-         disable opengl_vsync
-         disable v4l
-+        disable v4l2
-         disable x11
-         # Workaround compile errors from missing gmtime_r/localtime_r/uint def
-         CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
-         fi
-         disable symver
-         disable v4l
-+        disable v4l2
-         enable  windows
-         disable x11
-         ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
- 
- if enabled backend; then
-   echo "Video4Linux sup.          ${v4l-no}"
-+  echo "Video4Linux2 sup.         ${v4l2-no}"
-   echo "ivtv support              ${ivtv-no}"
-   echo "HD-PVR support            ${hdpvr-no}"
-   echo "FireWire support          ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- #include "go7007_myth.h"
- 
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else  // USING_V4l
-+#else  // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
- 
- #define KEYFRAMEDIST   30
- 
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
- 
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     usingv4l2 = true;
- 
-     struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
-     QString driver = (char *)vcap.driver;
-     if (driver == "go7007")
-         go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
-         audio_device->Close();
- }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
-     NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
-         act_text_buffer = 0;
-     textbuffer[act]->freeToEncode = 1;
- }
--#else  // USING_V4L
-+#else  // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
-     //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
- 
--#else  // USING_V4L
-+#else  // USING_V4L 
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
- 
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
- 
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-     }
-     else
-     {
-+#ifdef USING_V4L
-         struct video_tuner tuner;
-         bzero(&tuner, sizeof(tuner));
- 
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-         {
-             isLocked = tuner.signal;
-         }
-+#endif
-     }
- 
-     {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
- 
- #include <algorithm>
- 
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
- 
-@@ -28,6 +28,8 @@
- 
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
-     (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     struct v4l2_capability vcap;
-     bzero(&vcap, sizeof(vcap));
- 
-     return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
-             (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
-     return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
- 
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
-     if (videofd < 0)
-         return false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     // First try V4L2 query
-     struct v4l2_capability capability;
-     bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
-     }
-     else // Fallback to V4L1 query
-     {
-+#ifdef USING_V4L
-         struct video_capability capability;
-         if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
-             card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
-     }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- 
-     if (!driver.isEmpty())
-         driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-     InputNames list;
-     ok = false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
-     // V4L v2 query
-     struct v4l2_input vin;
-     bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-         ok = true;
-         return list;
-     }
-+#endif
- 
-     // V4L v1 query
-+#ifdef USING_V4L
-     struct video_capability vidcap;
-     bzero(&vidcap, sizeof(vidcap));
-     if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- 
-         list[i] = test.name;
-     }
--
-+#endif
-     // Create an input on single input cards that don't advertise input
-     if (!list.size())
-         list[0] = "Television";
- 
-     ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
-     list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-     return list;
- }
- 
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
- 
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
-         channel = new DVBChannel(device);
- #endif
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (("V4L" == card_type) || ("MPEG" == card_type))
-         channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
-     cardTypes += "'DVB'";
- #endif // USING_DVB
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (!cardTypes.isEmpty())
-         cardTypes += ",";
-     cardTypes += "'V4L'";
- # ifdef USING_IVTV
-     cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_IPTV
-     if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
- 
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
-     HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
-     HEADERS += vbitext/vbi.h vbitext/vt.h
-     SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
-     SOURCES += channelchangemonitor.cpp
- 
-     # Support for Video4Linux devices
--    using_v4l {
-+    using_v4l || using_v4l2 {
-         HEADERS += v4lchannel.h                analogsignalmonitor.h
-         SOURCES += v4lchannel.cpp              analogsignalmonitor.cpp
- 
--        DEFINES += USING_V4L
-+        using_v4l {
-+            DEFINES += USING_V4L
-+        }
-+
-+        using_v4l2 {
-+            DEFINES += USING_V4L2
-+        }
-     }
- 
-     # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- #   include "dvbchannel.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #   include "analogsignalmonitor.h"
- #   include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
-     }
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     if ((cardtype.toUpper() == "HDPVR"))
-     {
-         V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
- 
- #include "channelgroup.h"
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
- 
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
-     }
-     else // "V4L" or "MPEG", ie, analog TV
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         channel = new V4LChannel(this, genOpt.videodev);
-         if (!channel->Open())
-             return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
-     }
-     else
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         // V4L/MJPEG/GO7007 from here on
-         recorder = new NuppelVideoRecorder(this, channel);
-         recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-     }
- 
-     if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
- 
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
-                                   channel->GetCurrentName());
-     }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (GetV4LChannel())
-     {
-         channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-     {
-         if (fmt == "NTSC-JP")
-             return 6;
-+#ifdef USING_V4L
-         else if (fmt.left(5) == "SECAM")
-             return VIDEO_MODE_SECAM;
-+#endif
-         else if (fmt == "PAL-NC")
-             return 3;
-         else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt == "PAL-N")
-             return 5;
-         // generics...
-+#ifdef USING_V4L
-         else if (fmt.left(3) == "PAL")
-             return VIDEO_MODE_PAL;
-         else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt.left(4) == "ATSC")
-             return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
-         return VIDEO_MODE_NTSC;
-+#endif 
-     }
- 
-     VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
-     }
-     else if (1 == v4l_version)
-     {
-+#ifdef USING_V4L    
-         if (mode == VIDEO_MODE_NTSC)
-             return "NTSC";
-         else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
-             return "PAL-N";
-         else if (mode == 6)
-             return "NTSC-JP";
-+#endif
-     }
-     else
-     {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-         return true;
-     }
- 
-+#ifdef USING_V4L
-     // Video4Linux version 1 tuning
-     uint freq = frequency / 62500;
-     ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-                 .arg(device).arg(ioctlval).arg(strerror(errno)));
-         return false;
-     }
-+#endif
- 
-     SetSIStandard(si_std);
- 
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- 
-     if (usingv4l1)
-     {
-+#ifdef USING_V4L
-         VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
- 
-         // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-         {
-             VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                     "\n\t\t\twhile setting format (v4l v1)" + ENO);
--        }
--        else if (usingv4l2)
-+        } else
-+#endif
-+        if (usingv4l2)
-         {
-             VERBOSE(VB_IMPORTANT, LOC + msg +
-                     "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
-     return ok;
- }
- 
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
-     int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
-     }
-     return NULL;
- }
-+#endif
- 
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-     }
- 
-     // V4L1
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-         VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
-         return false;
-     }
--
-+#endif
-     return true;
- }
- 
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
- 
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
- 
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
-     unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
-     if (setfield)
-         return *setfield;
-+#endif
- 
-     return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- 
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-         // ???
-         return -1;
-     }
--
-+#endif
-     return 0;
- }
- 
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
- 
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
- 
- using namespace std;
- 
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- //       compiling with -std=c99.  We could remove this in the .pro file,
- //       but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size;                // its current size
- 
- 
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
- 
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
-     setTrigger(cardtype);
-     setSaveAll(false);
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     addTarget("V4L",       new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
-     addTarget("MPEG",      new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
-     addTarget("HDPVR",     new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     addTarget("DVB",       new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
- 
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("Analog V4L capture card"), "V4L");
-     setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
-     setting->addSelection(
-         QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
-         QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
-         "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_HDHOMERUN
-     setting->addSelection(
diff --git a/community-testing/mythtv/mythtv.install b/community-testing/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community-testing/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
-	return
-}
-
-post_remove() {
-   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community-testing/open-vm-tools-modules/PKGBUILD b/community-testing/open-vm-tools-modules/PKGBUILD
deleted file mode 100644
index 41d09db91..000000000
--- a/community-testing/open-vm-tools-modules/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 57352 2011-10-26 12:09:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
-
-pkgname=open-vm-tools-modules
-pkgver=2011.09.23
-_pkgsubver=491607
-pkgrel=2
-pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
-arch=('i686' 'x86_64')
-url="http://open-vm-tools.sourceforge.net/"
-license=('GPL')
-makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers')
-depends=("linux")
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz")
-md5sums=('599342eee8d531b35ca1cc948b61868f')
-
-build() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
-
-  cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \
-	--without-x --with-kernel-release=$KERNEL_RELEASE
-  (cd modules && make modules)
-}
-
-package() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
-  msg "Kernel = $KERNEL_VERSION"
-
-  cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-  mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
-  for MOD in `find -type f -name '*.ko'`; do
-    install -D -m644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
-  done
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install
-}
diff --git a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install
deleted file mode 100644
index 801d2c5b3..000000000
--- a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install
+++ /dev/null
@@ -1,34 +0,0 @@
-KERNEL_VERSION='2.6.38-ARCH'
-
-post_install() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-
-  VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;"
-  VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;"
-  VMXNET="$VMXNET /bin/true;"
-
-  echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf"
-  echo ">>> (this will disable pcnet32 driver)"
-  sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf
-  echo
-
-  echo ">>>"
-  echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually"
-  echo ">>> disable loading of pcnet32 driver"
-  echo ">>>"
-}
-
-post_upgrade() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_remove() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-
-  echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf"
-  sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf
-
-  echo ">>>"
-  echo ">>> Remember to un-blacklist pcnet32 driver"
-  echo ">>>"
-}
diff --git a/community-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD
deleted file mode 100644
index 38e3fab49..000000000
--- a/community-testing/paraview/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.10.1
-pkgrel=3
-pkgdesc='Parallel Visualization Application using VTK.'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' 
-makedepends=('cmake' 'desktop-file-utils')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
-        'paraview.png'
-        'paraview.desktop'
-        'fixkernelversioncheck.diff')
-md5sums=('d8a9d4a997a720589ffd57568bcdd449'
-         'db623002bc71a257ddfdd0c9c7b14c3f'
-         '4e4b7172ed18171c37446fd7c4f1e8f5'
-         '9e137af23701f76fc727222ebac23389')
-
-build() {
-  cd ParaView-${pkgver}
-
-  # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  cd VTK
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-  cd ..
-
-  sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx
-  sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx
-  sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx
-
-  # Paraview wants to be built out of source
-  mkdir -p build
-  cd build
-
-  # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_USE_PTHREADS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_SKIP_RPATH:BOOL=YES \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-    -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DBUILD_DOCUMENTATION:BOOL=OFF \
-    -DBUILD_EXAMPLES:BOOL=OFF \
-    -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-    -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=OFF \
-    -DVTK_USE_OFFSCREEN=TRUE \
-    -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-    -DPARAVIEW_USE_MPI:BOOL=ON \
-    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
-    ..
-
-  make
-}
-
-package() {
-  cd ParaView-${pkgver}/build
-
-  make DESTDIR=${pkgdir} install
-
-  # Install license
-  install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
-  # Install desktop shortcuts
-  install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
-  desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-
-  # Removes VTK plugin for designer - if you need, you can install vtk
-  #rm -rf ${pkgdir}/opt/paraview/plugins
-}
diff --git a/community-testing/paraview/fixkernelversioncheck.diff b/community-testing/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-testing/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-testing/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-testing/paraview/paraview.png
+++ /dev/null
diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD
deleted file mode 100644
index acf9a20ad..000000000
--- a/community-testing/percona-server/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=percona-server
-pkgver=5.5.16_rel22.0
-pkgrel=1
-pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
-arch=('i686' 'x86_64')
-
-depends=('mysql-clients' 'net-tools' 'libaio')
-conflicts=('mysql')
-provides=('mysql')
-optdepends=('perl-dbi' 'perl-dbd-mysql')
-makedepends=('cmake' 'openssl' 'zlib')
-
-license=('GPL')
-url="http://www.percona.com/software/percona-server/"
-options=('!libtool' 'emptydirs')
-backup=('etc/mysql/my.cnf')
-install=percona.install
-source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
-        'mysqld'
-        'my.cnf')
-
-build() {
-	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
-	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
-
-	cd "${srcdir}"
-	rm -rf build
-	mkdir build
-	cd build
-
-	# CFLAGS/CXXFLAGS as suggested upstream
-	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-	cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DSYSCONFDIR=/etc/mysql \
-		-DMYSQL_DATADIR=/var/lib/mysql \
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DDEFAULT_CHARSET=utf8 \
-		-DDEFAULT_COLLATION=utf8_general_ci \
-		-DENABLED_LOCAL_INFILE=ON \
-		-DINSTALL_INFODIR=share/mysql/docs \
-		-DINSTALL_MANDIR=share/man \
-		-DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
-		-DINSTALL_SCRIPTDIR=bin \
-		-DINSTALL_INCLUDEDIR=include/mysql \
-		-DINSTALL_DOCREADMEDIR=share/mysql \
-		-DINSTALL_SUPPORTFILESDIR=share/mysql \
-		-DINSTALL_MYSQLSHAREDIR=share/mysql \
-		-DINSTALL_DOCDIR=share/mysql/docs \
-		-DINSTALL_SHAREDIR=share/mysql \
-		-DWITH_READLINE=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
-
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR=${pkgdir} install
-
-	install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-	install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
-
-	# provided by libmysqlclient
-	rm ${pkgdir}/usr/bin/mysql_config
-	rm ${pkgdir}/usr/lib/libmysql*
-	rm -r ${pkgdir}/usr/include/
-	rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
-	# provided by mysql-clients
-	rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-	rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-	# not needed
-	rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
-	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-	install -dm700 "${pkgdir}"/var/lib/mysql
-}
-
-md5sums=('cfc4523a7110f07c193391f3e73d59ae'
-         '243864805611764a7e5883c1dba7afd8'
-         '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community-testing/percona-server/my.cnf b/community-testing/percona-server/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/community-testing/percona-server/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/community-testing/percona-server/mysqld b/community-testing/percona-server/mysqld
deleted file mode 100755
index 07f6b7e4c..000000000
--- a/community-testing/percona-server/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Percona Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Percona Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/percona-server/percona.install b/community-testing/percona-server/percona.install
deleted file mode 100644
index caacccf1b..000000000
--- a/community-testing/percona-server/percona.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  /usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/community-testing/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/python2-poppler/PKGBUILD b/community-testing/python2-poppler/PKGBUILD
deleted file mode 100644
index 42a670494..000000000
--- a/community-testing/python2-poppler/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 57166 2011-10-22 19:04:38Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=python2-poppler
-_realname=pypoppler
-pkgver=0.12.1
-pkgrel=6
-pkgdesc="Python 2.x bindings for Poppler"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/poppler-python"
-license=('GPL')
-depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2')
-provides=('pypoppler' 'python-poppler')
-conflicts=('python-poppler')
-replaces=('python-poppler')
-options=(!libtool)
-source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz"
-        'pypoppler-0.12.1-poppler-0.16.0.patch')
-md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a'
-         '683c5b67866d56adc2494120cc329dc8')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # poppler 0.16 compat
-  patch -Np0 -i \
-	  "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch"
-
-  # poppler 0.18 compat
-  sed -i "/pixbuf/,/^)/d" poppler.defs
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch b/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch
deleted file mode 100644
index 0e99b57ec..000000000
--- a/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler.defs.orig	2010-12-30 05:55:07.000000000 +0000
-+++ poppler.defs	2010-12-30 05:55:27.000000000 +0000
-@@ -1794,7 +1794,7 @@
- 
- (define-method get_text
-   (of-object "PopplerPage")
--  (c-name "poppler_page_get_text")
-+  (c-name "poppler_page_get_selected_text")
-   (return-type "char*")
-   (parameters
-     '("PopplerSelectionStyle" "style")
diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD
deleted file mode 100644
index 5ae16e53c..000000000
--- a/community-testing/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.2
-pkgrel=2
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python2: needed for search'
-            'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
-
-build() {
-  cd qbittorrent-${pkgver}
-
-  sed -i \
-    -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find ./ -name '*.py')
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd qbittorrent-${pkgver}
-
-  make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD
deleted file mode 100644
index 51fc7aaf5..000000000
--- a/community-testing/qlandkartegt/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 57247 2011-10-24 20:34:11Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: <boenki@gmx.de>
-
-pkgname=qlandkartegt
-pkgver=1.2.4
-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' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake' 'garmindev')
-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
-        'fix-glu-header.patch')
-sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c'
-            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0'
-            '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  patch -R -p2 -i "${srcdir}"/fix-glu-header.patch
-
-  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/fix-glu-header.patch b/community-testing/qlandkartegt/fix-glu-header.patch
deleted file mode 100644
index 214ad395d..000000000
--- a/community-testing/qlandkartegt/fix-glu-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- QLandkarteGT/trunk/src/CMap3D.cpp	2011/08/23 16:34:50	2943
-+++ QLandkarteGT/trunk/src/CMap3D.cpp	2011/09/03 07:58:02	2961
-@@ -31,8 +31,8 @@
- #include "CWptDB.h"
- #include "WptIcons.h"
- 
--#include <GL/glu.h>
- #include <QtGui>
-+#include <QtOpenGL>
- #include <math.h>
- 
- #ifndef GL_CLAMP_TO_EDGE
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 531d2ebe5..000000000
--- a/community-testing/qlandkartegt/qlandkartegt.changelog
+++ /dev/null
@@ -1,27 +0,0 @@
-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/qmc2/PKGBUILD b/community-testing/qmc2/PKGBUILD
deleted file mode 100644
index 779aff5bd..000000000
--- a/community-testing/qmc2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57249 2011-10-24 20:34:16Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=qmc2
-pkgver=0.2.b20
-pkgrel=2
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME."
-url="http://qmc2.arcadehits.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qt' 'phonon' 'sdl' 'libxmu' 'qtwebkit')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2")
-md5sums=('e868144815ff44a2146e839c2395c6d1')
-
-build() {
-  cd "$srcdir/$pkgname"
-  export CTIME=0
-  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/usr/share/{applications,pixmaps}
-  install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
-}
diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD
deleted file mode 100644
index 3ac8fa55a..000000000
--- a/community-testing/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 57251 2011-10-24 20:34:23Z andrea $
-# 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.3.1
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt>=4.7.4')
-makedepends=('qt-private-headers>=4.7.4' 'git')
-options=('docs')
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
-        'qtcreator.desktop')
-md5sums=('8aa296ed9034f847bd53ee0424e5ef08'
-         'f1f4680b9838ff0b8f4cf11eb850d662')
-
-build() {
-  cd ${srcdir}
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
-  make
-}
-
-package() {
-  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')
-  
-  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/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop
deleted file mode 100644
index 0fd562bd9..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/sigil/PKGBUILD b/community-testing/sigil/PKGBUILD
deleted file mode 100644
index 934bbbad7..000000000
--- a/community-testing/sigil/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 57253 2011-10-24 20:34:33Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.4.2
-pkgrel=2
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64') 
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-makedepends=('cmake')
-install=sigil.install
-source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip
-        ${pkgname}.desktop)
-md5sums=('ce27976254236f8b11b787fd05be9acb'
-         'fef6aa492af487ccccd6b133635cee5a')
-
-build() {
-  cd "${srcdir}"
-  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
-}
diff --git a/community-testing/sigil/sigil.desktop b/community-testing/sigil/sigil.desktop
deleted file mode 100755
index 4f3a14d20..000000000
--- a/community-testing/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community-testing/speed-dreams/PKGBUILD b/community-testing/speed-dreams/PKGBUILD
deleted file mode 100644
index 757a901fe..000000000
--- a/community-testing/speed-dreams/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 54504 2011-08-19 10:27:23Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
-pkgname=speed-dreams
-pkgver=2.0.0a3
-_pkgver=2.0.0-a3-r3412
-pkgrel=1
-pkgdesc="A racing simulator with rich graphics and physics"
-arch=('i686' 'x86_64')
-url="http://speed-dreams.sourceforge.net/"
-license=('GPL2')
-depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
-makedepends=('cmake' 'p7zip')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
-        "${pkgname}.desktop")
-md5sums=('659837e8866c59c85279c31fcaba4144'
-         'bd5c81bac696ec53628ba42684ef8369')
-
-build() {
-  7z x ${pkgname}-${_pkgver}-src.tar.7z
-  tar xf ${pkgname}-${_pkgver}-src.tar
-
-  cd "${pkgname}-${_pkgver}-src"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSD_BINDIR=/usr/bin \
-    -DSD_DATADIR=/usr/share/speed-dreams-2 \
-    -DSD_LIBDIR=/usr/lib/speed-dreams-2
-
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${_pkgver}-src"
-  
-  make DESTDIR="${pkgdir}/" install
-
-  rm -r "${pkgdir}/usr/share"
-
-  install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png"
-  install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop"
-
-  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r doc "${pkgdir}/usr/share/doc/${pkgname}/"
-
-  mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
-  rm doc/man/speed-dreams.es.6
-  cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/speed-dreams/speed-dreams.desktop b/community-testing/speed-dreams/speed-dreams.desktop
deleted file mode 100644
index 8c86d85cc..000000000
--- a/community-testing/speed-dreams/speed-dreams.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Speed Dreams
-Comment=The Open Racing Car Simulator Fork
-Exec=speed-dreams
-Icon=speed-dreams.svg
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-testing/speed-dreams/speed-dreams.sh b/community-testing/speed-dreams/speed-dreams.sh
deleted file mode 100644
index fa6dde97a..000000000
--- a/community-testing/speed-dreams/speed-dreams.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /opt/speed-dreams/bin
-./speed-dreams
diff --git a/community-testing/texmaker/PKGBUILD b/community-testing/texmaker/PKGBUILD
deleted file mode 100644
index 7db874e08..000000000
--- a/community-testing/texmaker/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com> 
-# Contributor: Firmicus <firmicus gmx net> 
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.1
-pkgrel=2
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
-
-build() {
-	cd ${pkgname}-${pkgver}
-
-	export INSTALL_ROOT=${pkgdir}
-
-	qmake -unix PREFIX=//usr texmaker.pro
-
-	make
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-
-	export INSTALL_PATH=${pkgdir}
-
-	make install
-}
diff --git a/community-testing/virtualbox-modules/60-vboxguest.rules b/community-testing/virtualbox-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community-testing/virtualbox-modules/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community-testing/virtualbox-modules/LocalConfig.kmk b/community-testing/virtualbox-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/community-testing/virtualbox-modules/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS =
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD
deleted file mode 100644
index ced055501..000000000
--- a/community-testing/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 57348 2011-10-26 10:15:54Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
-pkgver=4.1.4
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-         LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure \
-        --with-linux=/usr/src/linux-${_kernver} \
-        --disable-java \
-        --disable-docs \
-        --disable-xpcom \
-        --disable-python \
-        --disable-sdl-ttf \
-        --disable-alsa \
-        --disable-pulse \
-        --disable-dbus  \
-        --disable-opengl \
-        --build-headless \
-        --nofatal
-    source ./env.sh
-    kmk all
-
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-archlinux-modules(){
-    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-archlinux-modules.install
-    depends=('linux>=3.1' 'linux<3.2')
-    replaces=('virtualbox-guest-modules')
-    conflicts=('virtualbox-guest-modules')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
-        install -D -m644 ${module} \
-            "$pkgdir/lib/modules/${_extramodules}/${module}"
-    done
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install"
-}
-
-package_virtualbox-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
-    license=('GPL')
-    install=virtualbox-modules.install
-    depends=('linux>=3.1' 'linux<3.2')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
-    install -D -m644 vboxdrv.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
-    install -D -m644 vboxnetadp.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
-    install -D -m644 vboxnetflt.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
-    install -D -m644 vboxpci.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
deleted file mode 100644
index 39a0e4063..000000000
--- a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index 188c1874c..000000000
--- a/community-testing/virtualbox-modules/virtualbox-modules.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.1-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/community-testing/virtualbox/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk
deleted file mode 100644
index e5cbcebcd..000000000
--- a/community-testing/virtualbox/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD
deleted file mode 100644
index b39c517a6..000000000
--- a/community-testing/virtualbox/PKGBUILD
+++ /dev/null
@@ -1,185 +0,0 @@
-# $Id: PKGBUILD 57347 2011-10-26 10:09:31Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.4
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
-#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
-        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
-        change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
-    patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
-    patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --enable-vnc \
-        --nofatal \
-        --with-linux=/usr/src/linux-${_kernver}
-    source ./env.sh
-    kmk all
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-}
-
-package_virtualbox() {
-    pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
-    optdepends=('qt: for VirtualBox GUI'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: developer kit'
-                'virtualbox-source: host kernel source modules for non-stock kernels')
-
-    replaces=('virtualbox-ose')
-    conflicts=('virtualbox-ose')
-    install=virtualbox.install
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
-
-    #doc
-    install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf"
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
-}
-
-package_virtualbox-source() {
-    pkgdesc="VirtualBox kernel modules source"
-    depends=(linux-headers gcc make)
-    install=virtualbox-source.install
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-    mkdir -p $pkgdir/usr/lib/virtualbox
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    #sources for modules
-    cp -r src ${pkgdir}/usr/lib/virtualbox
-    #install compilation script
-    install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
-}
-
-package_virtualbox-sdk() {
-    pkgdesc="VirtualBox Software Developer Kit (SDK)"
-    depends=('python2')
-
-    mkdir -p "$pkgdir/usr/lib/virtualbox"
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-archlinux-additions(){
-    pkgdesc="Additions only for Arch Linux guests (userspace tools)"
-    depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
-    replaces=('virtualbox-guest-additions')
-    conflicts=('virtualbox-guest-additions')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-
-    install -d "$pkgdir"/{usr/bin,sbin}
-    install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
-    install -m755 mount.vboxsf "$pkgdir/sbin"
-
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_111.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
-
-    # install rc.d script
-    install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
-
-    # install sample config
-    install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
-}
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         'bc048d1e58d84ece4a186199ee48d4c8'
-         '5f85710e0b8606de967716ded7b2d351'
-         'cc3f278bc273011aa95277500a76f677'
-         '78ffa67ff131680f1d2b6f06d4325c5b'
-         'a82d698e7868315cdf876cfb02fd2268'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '778d865e56e31cc592fbfa257fdcfce7')
diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch
deleted file mode 100644
index d8531499d..000000000
--- a/community-testing/virtualbox/change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/community-testing/virtualbox/vbox-service.conf b/community-testing/virtualbox/vbox-service.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/community-testing/virtualbox/vbox-service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc
deleted file mode 100755
index c1af2134d..000000000
--- a/community-testing/virtualbox/vbox-service.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vbox-service
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
-  start)
-    stat_busy "Starting $name service"
-    [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon $name; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  stop)
-    stat_busy "Stopping $name service"
-    [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon $name; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy "Checking $name status";
-    ck_status $name
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-    exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/virtualbox/vboxbuild b/community-testing/virtualbox/vboxbuild
deleted file mode 100755
index cfc3c0a66..000000000
--- a/community-testing/virtualbox/vboxbuild
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-
-MODLIST=()
-LOG="/var/log/vbox-install.log"
->| "$LOG"
-
-if [[ $INSTALL_DIR ]]; then
-  VBOXMANAGE=$INSTALL_DIR/VBoxManage
-  BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
-  BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp
-  BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp
-  BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp
-else
-  echo "error: missing vbox.cfg"
-  exit 1
-fi
-
-if [[ -f /proc/modules ]]; then
-  IFS=$'\n' read -r -d '' -a MODLIST < \
-    <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules)
-fi
-
-if (( ${#MODLIST[*]} )); then
-  stat_busy "Unloading VirtualBox kernel modules"
-  modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
-for kdir in /lib/modules/[2-3]*; do
-  if [[ ! -d $kdir/kernel ]]; then
-    # found a stale kernel
-    mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
-    if (( ${#mods[@]} )); then
-      stat_busy "Removing all old VirtualBox kernel modules"
-      if rm -f "${mods[@]}" &&
-          rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
-        stat_done
-      else
-        stat_fail
-      fi
-    fi
-  fi
-done
-
-# default to the currently running kernel
-if (( ! $# )); then
-  set -- $(uname -r)
-fi
-
-for kernver; do
-  export KERN_DIR=/lib/modules/$kernver/build
-  if [[ ! -d $KERN_DIR ]]; then
-    printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
-        "$KERN_DIR"
-    continue
-  fi
-
-  stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
-    for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
-      if ! ${!build} \
-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
-        --no-print-directory install >> $LOG 2>&1; then
-        echo  "Look at $LOG to find out what went wrong"
-        stat_fail
-        continue
-      fi
-    done
-  stat_done
-done
-
-if (( ${#MODLIST[*]} )); then
-  stat_busy "Reloading VirtualBox kernel modules"
-  modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch
deleted file mode 100644
index c310dbc8d..000000000
--- a/community-testing/virtualbox/vboxdrv-reference.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
--  "package first. This package keeps track of Linux kernel changes and "
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+  "as root. This package keeps track of Linux kernel changes and"
-   "recompiles the vboxdrv kernel module if necessary."
-   );
- 
-@@ -92,7 +91,7 @@
-   "The VirtualBox kernel modules do not match this version of "
-   "VirtualBox. The installation of VirtualBox was apparently not "
-   "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-   "may correct this. Make sure that you do not mix the "
-   "OSE version and the PUEL version of VirtualBox."
-   );
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh	2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
-          available for the current kernel (`uname -r`) or it failed to
-          load. Please recompile the kernel module and install it by
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo /usr/bin/vboxbuild
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
-@@ -42,7 +42,7 @@
-     cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo /usr/bin/vboxbuild
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/community-testing/virtualbox/virtualbox-source.install b/community-testing/virtualbox/virtualbox-source.install
deleted file mode 100644
index 24d90b1c2..000000000
--- a/community-testing/virtualbox/virtualbox-source.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> To compile the modules do /usr/bin/vboxbuild
-EOF
-
-}
-
-post_upgrade() {
-/bin/cat << EOF
-===> To recompile the modules do /usr/bin/vboxbuild
-EOF
-}
diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install
deleted file mode 100644
index b2d2e8858..000000000
--- a/community-testing/virtualbox/virtualbox.install
+++ /dev/null
@@ -1,34 +0,0 @@
-utils() {
-    if [ -x usr/bin/update-mime-database ]; then
-        update-mime-database usr/share/mime > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/xdg-icon-resource ]; then
-        xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/update-desktop-database ]; then
-        usr/bin/update-desktop-database -q
-    fi
-}
-
-post_install() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    utils
-}
-
-post_upgrade() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    utils
-    if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then
-/bin/cat << EOF
-===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
-EOF
-    fi
-}
-
-post_remove() {
-    groupdel vboxusers >/dev/null 2>&1 || true
-    utils
-}
diff --git a/community-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD
deleted file mode 100644
index 7f17b62cd..000000000
--- a/community-testing/vtk/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=3
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
-            'java-runtime: java bindings'
-            'tk: tcl bindings'
-            'gnuplot: plotting tools'
-            'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
-         'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389')
-
-build() {
-  cd VTK
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake \
-    -Wno-dev \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
-    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
-    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-    -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
-    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
-    -DVTK_WRAP_JAVA:BOOL=ON \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
-    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    ${srcdir}/VTK
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/vtk
-  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
-    ${pkgdir}/usr/share/java/vtk
-
-  # Install license
-  install -dv ${pkgdir}/usr/share/licenses/vtk
-  install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/vtk
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community-testing/vtk/fixkernelversioncheck.diff b/community-testing/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-testing/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-testing/wkhtmltopdf/PKGBUILD b/community-testing/wkhtmltopdf/PKGBUILD
deleted file mode 100644
index 040e13dd1..000000000
--- a/community-testing/wkhtmltopdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57259 2011-10-24 20:34:47Z andrea $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-
-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')
-url="http://code.google.com/p/wkhtmltopdf/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  qmake wkhtmltopdf.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir/usr" install
-
-  # Generate and install man page
-  install -d "$pkgdir/usr/share/man/man1"
-  ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-}
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 32df8c75c..fed44e432 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=aria2
 pkgver=1.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://aria2.sourceforge.net/'
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
index 6582c4754..9e6f0e5ce 100644
--- a/community/camlp5/PKGBUILD
+++ b/community/camlp5/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('camlp5' 'camlp5-transitional')
 _baseversion=6.02.3
 _patchlevel=1
 pkgver=${_baseversion}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pauillac.inria.fr/~ddr/camlp5/'
 license=('BSD')
diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD
index 0ffc230e6..4fd420e77 100644
--- a/community/coq/PKGBUILD
+++ b/community/coq/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=coq
 pkgver=8.3pl2
-pkgrel=2
+pkgrel=3
 pkgdesc='Formal proof management system.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://coq.inria.fr/'
diff --git a/community/dzen2/PKGBUILD b/community/dzen2/PKGBUILD
index 22216ae9c..841626991 100644
--- a/community/dzen2/PKGBUILD
+++ b/community/dzen2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 27711 2010-09-27 09:27:49Z spupykin $
+# $Id: PKGBUILD 57590 2011-10-31 07:59:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Mark Taylor <skymt0@gmail.com>
 
 pkgname=dzen2
 pkgver=0.8.5
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64 'mips64el')
 pkgdesc="X notification utility"
 url="http://gotmor.googlepages.com/dzen"
@@ -18,29 +18,20 @@ build()
 {
   cd $srcdir/dzen2-$pkgver
 
-  patch -p0 config.mk <<EOF
-22,23c22,23
-< LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11
-< CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\"
----
-> #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11
-> #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\"
-34,35c34,35
-< #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm
-< #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM
----
-> LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
-> CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
-EOF
+  CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
+  LIBS=" -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`"
 
-  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+  echo "CFLAGS=$CFLAGS" >>config.mk
+  echo "LIBS=$LIBS" >>config.mk
+  echo "LDFLAGS=$LIBS" >>config.mk
 
-  make X11INC=/usr/include X11LIB=/usr/lib || return 1
-  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
+  make X11INC=/usr/include X11LIB=/usr/lib
+  (cd $srcdir/dzen2-$pkgver/gadgets && make X11INC=/usr/include X11LIB=/usr/lib)
+}
 
-  cd $srcdir/dzen2-$pkgver/gadgets
-  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
-  make X11INC=/usr/include X11LIB=/usr/lib || return 1
-  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1
+package() {
+  cd $srcdir/dzen2-$pkgver
+  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install
+  (cd $srcdir/dzen2-$pkgver/gadgets && make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install)
+  install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
 }
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 304d14760..5c6b7b0d6 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55596 2011-09-14 16:51:45Z spupykin $
+# $Id: PKGBUILD 57592 2011-10-31 08:12:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20110914
+pkgver=20111031
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -24,6 +24,7 @@ _gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion"
 	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
 	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
 	   "git://notion.git.sourceforge.net/gitroot/notion/contrib")
+#source=(https://downloads.sourceforge.net/project/notion/notion-3-2011102900-src.tar.bz2)
 
 build() {
   cd ${srcdir}
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index b58674215..d5d1c42c8 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Slash <demodevil5 [at] yahoo [dot] com>
 
 pkgname=nut
-pkgver=17.2
+pkgver=17.3
 pkgrel=1
 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
 url='http://nut.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('1c41ade70c164ebb9d9b291b24316984')
+md5sums=('791fa4730f82da66d539c0d4e82441a9')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD
new file mode 100644
index 000000000..40dd20936
--- /dev/null
+++ b/community/perl-package-stash-xs/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Justin Davis <jrcd83@gmail.com>
+# $Id: PKGBUILD 57660 2011-11-01 00:16:28Z juster $
+
+pkgname=perl-package-stash-xs
+pkgver=0.25
+pkgrel=1
+pkgdesc="faster and more correct implementation of the Package::Stash API"
+arch=(i686 x86_64)
+license=(PerlArtistic GPL)
+options=(!emptydirs)
+depends=('perl>=5.8.1')
+makedepends=('perl-extutils-makemaker>=6.30')
+checkdepends=('perl-test-fatal' 'perl-test-simple')
+url=https://metacpan.org/release/Package-Stash-XS
+source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz")
+md5sums=(52ece18842c46da8fb7a4a14dea910ab)
+sha512sums=(2b539d9ba1a68c5ba681e9eabbcde4b396f66dc8dbd3b1e333286ea7ce39b93b97ec4bd97c31681720a925553b128371ce2c48f11254806aebd5de868a22b528)
+_distdir="${srcdir}/Package-Stash-XS-${pkgver}"
+
+build() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    cd "$_distdir"
+    make test
+  )
+}
+
+package() {
+    cd "$_distdir"
+    make DESTDIR="$pkgdir" install
+    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+}
+
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
+# vim:set ts=2 sw=2 et:
diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD
new file mode 100644
index 000000000..df95826e9
--- /dev/null
+++ b/community/perl-params-util/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Justin Davis <jrcd83@gmail.com>
+# $Id: PKGBUILD 57661 2011-11-01 00:18:52Z juster $
+
+pkgname=perl-params-util
+pkgver=1.04
+pkgrel=1
+pkgdesc="Simple, compact and correct param-checking functions"
+arch=(i686 x86_64)
+license=(PerlArtistic GPL)
+options=(!emptydirs)
+depends=('perl>=5.5.30' 'perl-scalar-list-utils')
+makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52'
+             'perl-pathtools')
+checkdepends=('perl-test-simple')
+url=https://metacpan.org/release/Params-Util
+source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz")
+md5sums=(84bfb0a16cff67f2077ece0e24408b0f)
+sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d)
+_distdir="${srcdir}/Params-Util-${pkgver}"
+
+build() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    cd "$_distdir"
+    make test
+  )
+}
+
+package() {
+    cd "$_distdir"
+    make DESTDIR="$pkgdir" install
+    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+}
+
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
+# vim:set ts=2 sw=2 et:
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 846bb358d..441f9bb9f 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55793 2011-09-20 21:39:14Z cbrannon $
+# $Id: PKGBUILD 57586 2011-10-31 07:11:36Z cbrannon $
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 pkgname=plan9port
-pkgver=20110920
+pkgver=20111026
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64' 'mips64el')
@@ -48,5 +48,5 @@ build()
     rm -f $i
   done
 }
-md5sums=('ce91667f56c0f49849aae9c79a7cb58c'
+md5sums=('4aa76e73fcb9f716165dd628d052cd58'
          '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index b83dc429e..67219aee0 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137203 2011-09-06 17:17:14Z andrea $
+# $Id: PKGBUILD 141623 2011-10-31 21:27:41Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -8,7 +8,7 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.47.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 374660ce8..adacd8433 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 141222 2011-10-26 16:28:37Z ibiru $
+# $Id: PKGBUILD 141600 2011-10-31 15:48:45Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64 'mips64el')
@@ -17,7 +17,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('bca02495552b40d2f3867b66d490283481417ec0e489ba0cbff9e0f48b82822d'
+sha256sums=('9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index 4b08aacc3..e8cedeacf 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 57021 2009-10-31 09:42:53Z allan $
+# $Id: PKGBUILD 141631 2011-11-01 00:42:15Z giovanni $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tobias Kieslich [tobias.justdreams.de]
 
 pkgname=libxmi
 pkgver=1.2
-pkgrel=2
-pkgdesc="library for rasterizing 2-D vector graphics"
+pkgrel=5
+pkgdesc="A library for rasterizing 2-D vector graphics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libxmi/libxmi.html"
 license=('GPL')
 depends=('glibc')
+options=('!libtool')
+install=libxmi.install
 source=(http://mirrors.usc.edu/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('4e6935484f0ad71b531920bf4c546b47')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  rm config.guess config.sub install-sh missing
-  automake --add-missing
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  autoreconf --force --install
   ./configure --prefix=/usr --infodir=/usr/share/info
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libxmi/libxmi.install b/extra/libxmi/libxmi.install
new file mode 100644
index 000000000..5d9821e43
--- /dev/null
+++ b/extra/libxmi/libxmi.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libxmi.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index f467752b0..f6c2ad38d 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,12 +1,15 @@
-# $Id: PKGBUILD 136627 2011-08-31 07:47:27Z ibiru $
+# $Id: PKGBUILD 141617 2011-10-31 20:42:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
 [[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libglapi' 'libgl' 'libgles')
+# prepare 7.12/8.0
+#pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
 
 #_git=true
+_gitdate=20111031
 _git=false
 
 if [ "${_git}" = "true" ]; then
@@ -15,7 +18,7 @@ if [ "${_git}" = "true" ]; then
   else
     pkgver=7.11
 fi
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
@@ -26,9 +29,10 @@ source=(LICENSE)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
-	source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
+	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
   else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
+	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
+	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
 )
 fi
 [ "$CARCH" = "mips64el" ] && \
@@ -110,12 +114,8 @@ package_libgl() {
   bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
 
   cd src/mesa/drivers/dri
-  #make -C swrast DESTDIR="${pkgdir}" install
-if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-fi
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+
   ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
@@ -228,7 +228,7 @@ package_intel-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel"
 
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
 }
@@ -316,7 +316,3 @@ package_nouveau-dri() {
 #    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 #fi
 #}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'ff03aca82d0560009a076a87c888cf13'
-         'c7788f2495060bf133771aef6ad25929'
-         '598c24dccfcdcc99c07d883f7c09f36a')
diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD
index 1b075036d..85f3dfbda 100644
--- a/extra/nxserver/PKGBUILD
+++ b/extra/nxserver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136221 2011-08-24 21:00:37Z andyrtr $
+# $Id: PKGBUILD 141571 2011-10-31 07:33:57Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nxserver
 pkgver=3.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
 arch=(i686 x86_64 'mips64el')
 url="http://nomachine.com/"
@@ -20,7 +20,7 @@ http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
 #X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-5.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
 #Compression libs and proxy sources
 http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
@@ -33,7 +33,7 @@ md5sums=('12060433a74ac61a1c776d1d6d136117'
          '84c7f1575d9a1506370125ed050514ab'
          'cf38ec1e5a5f6453946cd387c14f2684'
          'ad8c0f133122c6d07732ca69c8759410'
-         '1086a92fb523d0a5d3685b89f1c96b9f'
+         '0a36c7e6a86c6c741179464b8f79c487'
          '84ade443b79ea079380b754aba9d392e'
          '488bb4d9b8e9f82dc272b4e6e9c57d30'
          'abde2ccc33e31fc695031c2cfb60f3dd'
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 9523fa924..260ee2d77 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141136 2011-10-24 17:18:00Z andrea $
+# $Id: PKGBUILD 141613 2011-10-31 19:59:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.2
+pkgver=2.7.3
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0cc853aee90e40db49ac7cb25cdf3619')
+md5sums=('2674ab79c3ec17e4d1b7ecfc76651cd0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 7390c8b74..90f24162e 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $
+# $Id: PKGBUILD 141602 2011-10-31 15:52:30Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
+
 pkgname=telepathy-idle
-pkgver=0.1.10
+pkgver=0.1.11
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +15,7 @@ depends=('telepathy-glib' 'openssl')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a')
+md5sums=('be277e8f0bd32ae56af799f0ff4ec72e')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index 3ace6a666..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: PKGBUILD 57474 2011-10-28 11:14:40Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=1
-#_snapshot=4.6-20110819
-_libstdcppmanver=20110814		# 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.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64.patch
-	gcc-hash-style-both.patch)
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
-         'ce920d2550ff7e042b9f091d27764d8f'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libssp --disable-libstdcxx-pch \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -rf ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl')
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/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
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index 883de6480..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,167 +0,0 @@
-# $Id: PKGBUILD 57274 2011-10-25 08:56:21Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuild with each new glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.14.1
-pkgrel=1
-_glibcdate=20111025
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.1-static-shared-getpagesize.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.13-futex.patch
-        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        lib32-glibc.conf)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '7d0154b7e17ea218c9fa953599d24cc4'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'a8f4549c716cd37244fbf1ed059497f8')
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
-  # using Fedora "fix" as patch in that bug report causes breakages...
-  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches do not fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  export CC="gcc -m32"
-
-  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
-  echo "slibdir=/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --enable-multi-arch i686-unknown-linux-gnu
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "s#=no#=yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}}
-
-  # We need one 32 bit specific header file
-  find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
-  # manually strip files as stripping libpthread-*.so and libthread_db.so
-  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
-  # valgrind on x86_64
-
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/lib32/getconf/*
-
-  strip $STRIP_STATIC usr/lib32/*.a \
-                      lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
-  strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
-                      lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/lib
-  ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/
-
-  # Add lib32 paths to the default library search path
-  install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
-  # Symlink /usr/lib32/locale to /usr/lib/locale
-  ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
-   assert (GLRO(dl_pagesize) != 0);
-   return GLRO(dl_pagesize);
- #else
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- 	cfi_restore(%r12)
- 	retq
- 
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- 	cfi_adjust_cfa_offset(16)
- 	cfi_rel_offset(%r12, 8)
- 	cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
- 
- 7:	movq	%rdx, %rax
- 
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- 	addq	$16, %rsp
- 	cfi_adjust_cfa_offset(-16)
- 	popq	%r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- 	cfi_restore(%r12)
- 	retq
- 
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- 	cfi_adjust_cfa_offset(16)
- 	cfi_rel_offset(%r12, 8)
- 	cfi_rel_offset(%r13, 0)
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index a1c8c4199..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/lib32
-/usr/lib32
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index beb5ed17a..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 57565 2011-10-30 20:00:47Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.27
-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)
-md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd'
-         'c722c8406507b7e3a8da7a3030d1d9cf')
-
-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"
-
-  # libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 348c2a795..000000000
--- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,14 +26,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
- 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_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
- 
- libdrm_intel_la_SOURCES = \
- 	intel_bufmgr.c \
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index e733861f9..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 57473 2011-10-28 11:13:37Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuild with each new gcc version
-
-pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libltdl)
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd "$srcdir"
-
-  rm -rf libtool-64 libtool-32
-  mv libtool-$pkgver libtool-64
-  cp -a libtool-64 libtool-32
-
-  msg2 "Building libtool-64..."
-  cd "$srcdir/libtool-64"
-  ./configure --prefix=/usr
-  make
-
-  msg2 "Building libtool-32..."
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  cd "$srcdir/libtool-32"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-check() {
-  cd "$srcdir/libtool-64"
-  make check
-  cd "$srcdir/libtool-32"
-  make check
-}
-
-package_libtool-multilib() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
-  groups=('multilib-devel')
-  install=libtool.install
-  provides=("libtool=$pkgver-$pkgrel")
-  conflicts=(libtool)
-
-  cd "$srcdir/libtool-64"
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_lib32-libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
-  depends=(lib32-glibc libltdl)
-  replaces=(lib32-libtool)
-  provides=("lib32-libtool=$pkgver-$pkgrel")
-  conflicts=(lib32-libtool)
-
-  cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib-testing/libtool-multilib/libtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch
deleted file mode 100644
index 3ad8b418a..000000000
--- a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Wed, 26 May 2010 18:28:59 +0200
-Subject: [PATCH] Fix scope handling during dl_close
-
----
- ChangeLog          |   12 ++++++++++++
- elf/Makefile       |   10 +++++++++-
- elf/dl-close.c     |    7 +++++++
- elf/unload8.c      |   33 +++++++++++++++++++++++++++++++++
- elf/unload8mod1.c  |    7 +++++++
- elf/unload8mod1x.c |    1 +
- elf/unload8mod2.c  |    7 +++++++
- elf/unload8mod3.c  |   27 +++++++++++++++++++++++++++
- 8 files changed, 103 insertions(+), 1 deletions(-)
- create mode 100644 elf/unload8.c
- create mode 100644 elf/unload8mod1.c
- create mode 100644 elf/unload8mod1x.c
- create mode 100644 elf/unload8mod2.c
- create mode 100644 elf/unload8mod3.c
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 59e835f..65b6deb 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -89,6 +89,7 @@ distribute	:= rtld-Rules \
- 		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
- 		   unload6mod1.c unload6mod2.c unload6mod3.c \
- 		   unload7mod1.c unload7mod2.c \
-+		   unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
- 		   tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
- 		   tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
- 		   tst-auditmod4a.c tst-auditmod4b.c \
-@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
- 	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
- 	 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
--	 unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
-+	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2
-@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
- 		unload6mod1 unload6mod2 unload6mod3 \
- 		unload7mod1 unload7mod2 \
-+		unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
- 		order2mod1 order2mod2 order2mod3 order2mod4 \
- 		tst-unique1mod1 tst-unique1mod2 \
- 		tst-unique2mod1 tst-unique2mod2
-@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl)
- $(objpfx)unload6mod3.so: $(libdl)
- $(objpfx)unload7mod1.so: $(libdl)
- $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
-+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
-+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
-+$(objpfx)unload8mod3.so: $(libdl)
- $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
- $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
- $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
-@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl)
- $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
- unload7-ENV = MALLOC_PERTURB_=85
- 
-+$(objpfx)unload8: $(libdl)
-+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
-+
- ifdef libdl
- $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
- $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 700e765..f47d5f8 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
- 
- 	      imap->l_scope_max = new_size;
- 	    }
-+	  else if (new_list != NULL)
-+	    {
-+	      /* We didn't change the scope array, so reset the search
-+		 list.  */
-+	      imap->l_searchlist.r_list = NULL;
-+	      imap->l_searchlist.r_nlist = 0;
-+	    }
- 
- 	  /* The loader is gone, so mark the object as not having one.
- 	     Note: l_idx != IDX_STILL_USED -> object will be removed.  */
-diff --git a/elf/unload8.c b/elf/unload8.c
-new file mode 100644
-index 0000000..f984a38
---- /dev/null
-+++ b/elf/unload8.c
-@@ -0,0 +1,33 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+int
-+main (void)
-+{
-+  void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
-+  if (h == NULL)
-+    {
-+      puts ("dlopen unload8mod1.so failed");
-+      return 1;
-+    }
-+
-+  void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
-+  if (h2 == NULL)
-+    {
-+      puts ("dlopen unload8mod1x.so failed");
-+      return 1;
-+    }
-+  dlclose (h2);
-+
-+  int (*mod1) (void) = dlsym (h, "mod1");
-+  if (mod1 == NULL)
-+    {
-+      puts ("dlsym failed");
-+      return 1;
-+    }
-+
-+  mod1 ();
-+  dlclose (h);
-+
-+  return 0;
-+}
-diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c
-new file mode 100644
-index 0000000..fe7e81c
---- /dev/null
-+++ b/elf/unload8mod1.c
-@@ -0,0 +1,7 @@
-+extern void mod2 (void);
-+
-+void
-+mod1 (void)
-+{
-+  mod2 ();
-+}
-diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c
-new file mode 100644
-index 0000000..835b634
---- /dev/null
-+++ b/elf/unload8mod1x.c
-@@ -0,0 +1 @@
-+int mod1x;
-diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c
-new file mode 100644
-index 0000000..2fd8b67
---- /dev/null
-+++ b/elf/unload8mod2.c
-@@ -0,0 +1,7 @@
-+extern void mod3 (void);
-+
-+void
-+mod2 (void)
-+{
-+  mod3 ();
-+}
-diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c
-new file mode 100644
-index 0000000..d49e22b
---- /dev/null
-+++ b/elf/unload8mod3.c
-@@ -0,0 +1,27 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+void
-+mod3_fini2 (void)
-+{
-+}
-+
-+void
-+mod3_fini (void)
-+{
-+  mod3_fini2 ();
-+}
-+
-+void
-+mod3 (void)
-+{
-+  void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
-+  if (h == NULL)
-+    {
-+      puts ("dlopen unload8mod2.so failed");
-+      exit (1);
-+    }
-+
-+  atexit (mod3_fini);
-+}
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
deleted file mode 100644
index ef91116e5..000000000
--- a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 1 Sep 2011 10:46:14 +0200
-Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
-
----
- ChangeLog          |    4 ++++
- resolv/res_query.c |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 2f7cfaa..2ded9fb 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
- 	    && *resplen2 > (int) sizeof (HEADER))
- 	  {
- 	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
-+	    assert (n == 0 || hp != hp2);
- 	    hp = hp2;
- 	  }
- 	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib/lib32-json-c/PKGBUILD b/multilib/lib32-json-c/PKGBUILD
deleted file mode 100644
index 07670938e..000000000
--- a/multilib/lib32-json-c/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: congyiwu <congyiwu AT gmail DOT com>
-
-_pkgbasename=json-c
-pkgname=lib32-$_pkgbasename
-pkgver=0.9
-pkgrel=1
-pkgdesc="A JSON implementation in C (32-bit)"
-url="http://oss.metaparadigm.com/json-c/"
-license=("MIT")
-arch=('x86_64')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib' 'libtool-multilib')
-source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('3a13d264528dcbaf3931b0cede24abae')
-options=(!libtool)
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir/usr/include"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libpulse/version-number.patch b/multilib/lib32-libpulse/version-number.patch
deleted file mode 100644
index 473b252a9..000000000
--- a/multilib/lib32-libpulse/version-number.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
-Author: Colin Guthrie <colin@mageia.org>
-Date:   Sat Oct 1 12:03:44 2011 +0100
-
-    libpulse: Always return a three part version number in API calls.
-    
-    For both the headers and the library we should provide clean, three part
-    strings as this has been what we've previously done in the past
-    and some external systems apparently rely on this format. While it's not
-    something we've officially commented on before, there is no real advantage
-    to us to change it so let's not try to tidy things up too much
-    considering some third party apps (e.g. Skype) seem to dislike a two
-    part version string.
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index 25d04a1..af144aa 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
- }
- 
- const char* pa_get_library_version(void) {
--    return PACKAGE_VERSION;
-+    return pa_get_headers_version();
- }
- 
- const char* pa_context_get_server(pa_context *c) {
-diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
-index 7e00c5e..1be4c75 100644
---- a/src/pulse/version.h.in
-+++ b/src/pulse/version.h.in
-@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--#define pa_get_headers_version() ("@PACKAGE_VERSION@")
-+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
- 
- /** Return the version of the library the current application is
-  * linked to. */
diff --git a/multilib/lib32-nss/distrust-diginotar.patch b/multilib/lib32-nss/distrust-diginotar.patch
deleted file mode 100644
index 60c63fc68..000000000
--- a/multilib/lib32-nss/distrust-diginotar.patch
+++ /dev/null
@@ -1,1675 +0,0 @@
-Index: security/nss/lib/ckfw/builtins/certdata.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
-retrieving revision 1.67.2.10
-retrieving revision 1.67.2.11
-diff -u -r1.67.2.10 -r1.67.2.11
---- security/nss/lib/ckfw/builtins/certdata.c	1 Aug 2011 06:40:03 -0000	1.67.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.c	30 Aug 2011 20:04:39 -0000	1.67.2.11
-@@ -35,7 +35,7 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- #ifdef DEBUG
--static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
-+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
- #endif /* DEBUG */
- 
- #ifndef BUILTINS_H
-@@ -1039,12 +1039,6 @@
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
-  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
- };
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
-- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
--};
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
-- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
--};
- #ifdef DEBUG
- static const NSSItem nss_builtins_items_0 [] = {
-   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -1053,7 +1047,7 @@
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)"CVS ID", (PRUint32)7 },
-   { (void *)"NSS", (PRUint32)4 },
--  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
-+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
- };
- #endif /* DEBUG */
- static const NSSItem nss_builtins_items_1 [] = {
-@@ -12506,151 +12500,6 @@
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)"DigiNotar Root CA", (PRUint32)18 },
--  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
--  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
--  { (void *)"0", (PRUint32)2 },
--  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
--  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
--  { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
--"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
--"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
--"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
--"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
--"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
--"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
--"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
--"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
--"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
--"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
--"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
--"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
--"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
--"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
--"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
--"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
--"\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\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
--"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
--"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
--"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
--"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
--"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
--"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
--"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
--"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
--"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
--"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
--"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
--"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
--"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
--"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
--"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
--"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
--"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
--"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
--"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
--"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
--"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
--"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
--"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
--"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
--"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
--"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
--"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
--"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
--"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
--"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
--"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
--"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035"
--"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125"
--"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
--"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
--"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
--"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
--"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
--"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
--"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
--"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
--"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
--"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
--"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
--"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
--"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
--"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
--"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
--"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
--"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
--"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
--"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
--"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
--"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
--"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
--"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
--"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
--"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
--"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
--"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
--"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
--"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
--"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
--"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
--"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
--"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
--"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
--"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
--"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
--, (PRUint32)1422 }
--};
--static const NSSItem nss_builtins_items_187 [] = {
--  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
--  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)"DigiNotar Root CA", (PRUint32)18 },
--  { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
--"\201\147\107\214"
--, (PRUint32)20 },
--  { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
--, (PRUint32)16 },
--  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
--  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
--  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
--  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
--  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
--  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
--};
--static const NSSItem nss_builtins_items_188 [] = {
--  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
--  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
--  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
-   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-   { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-@@ -12738,7 +12587,7 @@
- "\244\140\114\260\125\240\240\173\127\262"
- , (PRUint32)1002 }
- };
--static const NSSItem nss_builtins_items_189 [] = {
-+static const NSSItem nss_builtins_items_187 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12765,7 +12614,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_190 [] = {
-+static const NSSItem nss_builtins_items_188 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12874,7 +12723,7 @@
- "\333"
- , (PRUint32)1217 }
- };
--static const NSSItem nss_builtins_items_191 [] = {
-+static const NSSItem nss_builtins_items_189 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12902,7 +12751,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_192 [] = {
-+static const NSSItem nss_builtins_items_190 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12976,7 +12825,7 @@
- "\334\335\363\377\035\054\072\026\127\331\222\071\326"
- , (PRUint32)653 }
- };
--static const NSSItem nss_builtins_items_193 [] = {
-+static const NSSItem nss_builtins_items_191 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13005,7 +12854,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_194 [] = {
-+static const NSSItem nss_builtins_items_192 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13097,7 +12946,7 @@
- "\321\236\164\310\166\147"
- , (PRUint32)1078 }
- };
--static const NSSItem nss_builtins_items_195 [] = {
-+static const NSSItem nss_builtins_items_193 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13122,7 +12971,7 @@
-   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_196 [] = {
-+static const NSSItem nss_builtins_items_194 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13219,7 +13068,7 @@
- "\253\205\322\140\126\132"
- , (PRUint32)1030 }
- };
--static const NSSItem nss_builtins_items_197 [] = {
-+static const NSSItem nss_builtins_items_195 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13247,7 +13096,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_198 [] = {
-+static const NSSItem nss_builtins_items_196 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13332,7 +13181,7 @@
- "\164"
- , (PRUint32)897 }
- };
--static const NSSItem nss_builtins_items_199 [] = {
-+static const NSSItem nss_builtins_items_197 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13358,7 +13207,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_200 [] = {
-+static const NSSItem nss_builtins_items_198 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13455,7 +13304,7 @@
- "\374\276\337\012\015"
- , (PRUint32)1013 }
- };
--static const NSSItem nss_builtins_items_201 [] = {
-+static const NSSItem nss_builtins_items_199 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13484,7 +13333,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_202 [] = {
-+static const NSSItem nss_builtins_items_200 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13595,7 +13444,7 @@
- "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
- , (PRUint32)1151 }
- };
--static const NSSItem nss_builtins_items_203 [] = {
-+static const NSSItem nss_builtins_items_201 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13627,7 +13476,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_204 [] = {
-+static const NSSItem nss_builtins_items_202 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13781,7 +13630,7 @@
- "\103\307\003\340\067\116\135\012\334\131\040\045"
- , (PRUint32)1964 }
- };
--static const NSSItem nss_builtins_items_205 [] = {
-+static const NSSItem nss_builtins_items_203 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13809,7 +13658,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_206 [] = {
-+static const NSSItem nss_builtins_items_204 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13890,7 +13739,7 @@
- "\300\226\130\057\352\273\106\327\273\344\331\056"
- , (PRUint32)940 }
- };
--static const NSSItem nss_builtins_items_207 [] = {
-+static const NSSItem nss_builtins_items_205 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13913,7 +13762,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_208 [] = {
-+static const NSSItem nss_builtins_items_206 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14047,7 +13896,7 @@
- "\005\211\374\170\326\134\054\046\103\251"
- , (PRUint32)1642 }
- };
--static const NSSItem nss_builtins_items_209 [] = {
-+static const NSSItem nss_builtins_items_207 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14075,7 +13924,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_210 [] = {
-+static const NSSItem nss_builtins_items_208 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14180,7 +14029,7 @@
- "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_211 [] = {
-+static const NSSItem nss_builtins_items_209 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14207,7 +14056,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_212 [] = {
-+static const NSSItem nss_builtins_items_210 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14312,7 +14161,7 @@
- "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_213 [] = {
-+static const NSSItem nss_builtins_items_211 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14339,7 +14188,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_214 [] = {
-+static const NSSItem nss_builtins_items_212 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14432,7 +14281,7 @@
- "\230"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_215 [] = {
-+static const NSSItem nss_builtins_items_213 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14459,7 +14308,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_216 [] = {
-+static const NSSItem nss_builtins_items_214 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14548,7 +14397,7 @@
- "\126\144\127"
- , (PRUint32)931 }
- };
--static const NSSItem nss_builtins_items_217 [] = {
-+static const NSSItem nss_builtins_items_215 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14575,7 +14424,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_218 [] = {
-+static const NSSItem nss_builtins_items_216 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14656,7 +14505,7 @@
- "\000\147\240\161\000\202\110"
- , (PRUint32)919 }
- };
--static const NSSItem nss_builtins_items_219 [] = {
-+static const NSSItem nss_builtins_items_217 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14680,7 +14529,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_220 [] = {
-+static const NSSItem nss_builtins_items_218 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14762,7 +14611,7 @@
- "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
- , (PRUint32)943 }
- };
--static const NSSItem nss_builtins_items_221 [] = {
-+static const NSSItem nss_builtins_items_219 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14786,7 +14635,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_222 [] = {
-+static const NSSItem nss_builtins_items_220 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14867,7 +14716,7 @@
- "\246\210\070\316\125"
- , (PRUint32)933 }
- };
--static const NSSItem nss_builtins_items_223 [] = {
-+static const NSSItem nss_builtins_items_221 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14890,7 +14739,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_224 [] = {
-+static const NSSItem nss_builtins_items_222 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15009,7 +14858,7 @@
- "\201\370\021\234"
- , (PRUint32)1460 }
- };
--static const NSSItem nss_builtins_items_225 [] = {
-+static const NSSItem nss_builtins_items_223 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15035,7 +14884,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_226 [] = {
-+static const NSSItem nss_builtins_items_224 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15169,7 +15018,7 @@
- "\311\234\220\332\354\251\102\074\255\266\002"
- , (PRUint32)1307 }
- };
--static const NSSItem nss_builtins_items_227 [] = {
-+static const NSSItem nss_builtins_items_225 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15207,7 +15056,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_228 [] = {
-+static const NSSItem nss_builtins_items_226 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15285,7 +15134,7 @@
- "\366\324\357\277\114\210\150"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_229 [] = {
-+static const NSSItem nss_builtins_items_227 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15309,7 +15158,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_230 [] = {
-+static const NSSItem nss_builtins_items_228 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15387,7 +15236,7 @@
- "\246\347\313\100\003\335\171"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_231 [] = {
-+static const NSSItem nss_builtins_items_229 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15411,7 +15260,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_232 [] = {
-+static const NSSItem nss_builtins_items_230 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15538,7 +15387,7 @@
- "\320\352\111\242\034\215\122\024\246\012\223"
- , (PRUint32)1515 }
- };
--static const NSSItem nss_builtins_items_233 [] = {
-+static const NSSItem nss_builtins_items_231 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15566,7 +15415,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_234 [] = {
-+static const NSSItem nss_builtins_items_232 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15640,7 +15489,7 @@
- "\366\356\260\132\116\111\104\124\130\137\102\203"
- , (PRUint32)828 }
- };
--static const NSSItem nss_builtins_items_235 [] = {
-+static const NSSItem nss_builtins_items_233 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15663,7 +15512,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_236 [] = {
-+static const NSSItem nss_builtins_items_234 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15739,7 +15588,7 @@
- "\011\333\212\101\202\236\146\233\021"
- , (PRUint32)857 }
- };
--static const NSSItem nss_builtins_items_237 [] = {
-+static const NSSItem nss_builtins_items_235 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15762,7 +15611,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_238 [] = {
-+static const NSSItem nss_builtins_items_236 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15845,7 +15694,7 @@
- "\262\033\211\124"
- , (PRUint32)932 }
- };
--static const NSSItem nss_builtins_items_239 [] = {
-+static const NSSItem nss_builtins_items_237 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15869,7 +15718,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_240 [] = {
-+static const NSSItem nss_builtins_items_238 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15969,7 +15818,7 @@
- "\021\055"
- , (PRUint32)1026 }
- };
--static const NSSItem nss_builtins_items_241 [] = {
-+static const NSSItem nss_builtins_items_239 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15999,7 +15848,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_242 [] = {
-+static const NSSItem nss_builtins_items_240 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16073,7 +15922,7 @@
- "\367\130\077\056\162\002\127\243\217\241\024\056"
- , (PRUint32)652 }
- };
--static const NSSItem nss_builtins_items_243 [] = {
-+static const NSSItem nss_builtins_items_241 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16102,7 +15951,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_244 [] = {
-+static const NSSItem nss_builtins_items_242 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16208,7 +16057,7 @@
- "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
- , (PRUint32)1070 }
- };
--static const NSSItem nss_builtins_items_245 [] = {
-+static const NSSItem nss_builtins_items_243 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16240,7 +16089,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_246 [] = {
-+static const NSSItem nss_builtins_items_244 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16319,7 +16168,7 @@
- "\017\212"
- , (PRUint32)690 }
- };
--static const NSSItem nss_builtins_items_247 [] = {
-+static const NSSItem nss_builtins_items_245 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16349,7 +16198,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_248 [] = {
-+static const NSSItem nss_builtins_items_246 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16464,7 +16313,7 @@
- "\354\315\202\141\361\070\346\117\227\230\052\132\215"
- , (PRUint32)1213 }
- };
--static const NSSItem nss_builtins_items_249 [] = {
-+static const NSSItem nss_builtins_items_247 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16496,7 +16345,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_250 [] = {
-+static const NSSItem nss_builtins_items_248 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16594,7 +16443,7 @@
- "\055\247\330\206\052\335\056\020"
- , (PRUint32)904 }
- };
--static const NSSItem nss_builtins_items_251 [] = {
-+static const NSSItem nss_builtins_items_249 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16627,7 +16476,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_252 [] = {
-+static const NSSItem nss_builtins_items_250 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16729,7 +16578,7 @@
- "\330\316\304\143\165\077\131\107\261"
- , (PRUint32)1049 }
- };
--static const NSSItem nss_builtins_items_253 [] = {
-+static const NSSItem nss_builtins_items_251 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16759,7 +16608,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_254 [] = {
-+static const NSSItem nss_builtins_items_252 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16878,7 +16727,7 @@
- "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
- , (PRUint32)1486 }
- };
--static const NSSItem nss_builtins_items_255 [] = {
-+static const NSSItem nss_builtins_items_253 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16903,7 +16752,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_256 [] = {
-+static const NSSItem nss_builtins_items_254 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16993,7 +16842,7 @@
- "\315\345\250"
- , (PRUint32)1043 }
- };
--static const NSSItem nss_builtins_items_257 [] = {
-+static const NSSItem nss_builtins_items_255 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17017,7 +16866,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_258 [] = {
-+static const NSSItem nss_builtins_items_256 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17122,7 +16971,7 @@
- "\115\273\306\104\333\066\313\052\234\216"
- , (PRUint32)1258 }
- };
--static const NSSItem nss_builtins_items_259 [] = {
-+static const NSSItem nss_builtins_items_257 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17147,7 +16996,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_260 [] = {
-+static const NSSItem nss_builtins_items_258 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17223,7 +17072,7 @@
- "\002\153\331\132"
- , (PRUint32)820 }
- };
--static const NSSItem nss_builtins_items_261 [] = {
-+static const NSSItem nss_builtins_items_259 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17247,7 +17096,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_262 [] = {
-+static const NSSItem nss_builtins_items_260 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17329,7 +17178,7 @@
- "\362"
- , (PRUint32)881 }
- };
--static const NSSItem nss_builtins_items_263 [] = {
-+static const NSSItem nss_builtins_items_261 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17354,7 +17203,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_264 [] = {
-+static const NSSItem nss_builtins_items_262 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17470,7 +17319,7 @@
- "\113\076\053\070\007\125\230\136\244"
- , (PRUint32)1465 }
- };
--static const NSSItem nss_builtins_items_265 [] = {
-+static const NSSItem nss_builtins_items_263 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17494,7 +17343,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_266 [] = {
-+static const NSSItem nss_builtins_items_264 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17559,7 +17408,7 @@
- "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_267 [] = {
-+static const NSSItem nss_builtins_items_265 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17586,7 +17435,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_268 [] = {
-+static const NSSItem nss_builtins_items_266 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17651,7 +17500,7 @@
- "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_269 [] = {
-+static const NSSItem nss_builtins_items_267 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17678,7 +17527,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_270 [] = {
-+static const NSSItem nss_builtins_items_268 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17775,7 +17624,7 @@
- "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
- , (PRUint32)1038 }
- };
--static const NSSItem nss_builtins_items_271 [] = {
-+static const NSSItem nss_builtins_items_269 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17803,7 +17652,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_272 [] = {
-+static const NSSItem nss_builtins_items_270 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17894,7 +17743,7 @@
- "\336\102\343\055\202\361\017\345\372\227"
- , (PRUint32)954 }
- };
--static const NSSItem nss_builtins_items_273 [] = {
-+static const NSSItem nss_builtins_items_271 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17922,7 +17771,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_274 [] = {
-+static const NSSItem nss_builtins_items_272 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18001,7 +17850,7 @@
- "\130\077\137"
- , (PRUint32)867 }
- };
--static const NSSItem nss_builtins_items_275 [] = {
-+static const NSSItem nss_builtins_items_273 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18025,7 +17874,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_276 [] = {
-+static const NSSItem nss_builtins_items_274 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18118,7 +17967,7 @@
- "\045\361\224\264\146"
- , (PRUint32)997 }
- };
--static const NSSItem nss_builtins_items_277 [] = {
-+static const NSSItem nss_builtins_items_275 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18145,7 +17994,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_278 [] = {
-+static const NSSItem nss_builtins_items_276 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18269,7 +18118,7 @@
- "\156\117\022\176\012\074\235\225"
- , (PRUint32)1560 }
- };
--static const NSSItem nss_builtins_items_279 [] = {
-+static const NSSItem nss_builtins_items_277 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18294,7 +18143,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_280 [] = {
-+static const NSSItem nss_builtins_items_278 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18413,7 +18262,7 @@
- "\333\374\046\210\307"
- , (PRUint32)1525 }
- };
--static const NSSItem nss_builtins_items_281 [] = {
-+static const NSSItem nss_builtins_items_279 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18437,7 +18286,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_282 [] = {
-+static const NSSItem nss_builtins_items_280 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18593,7 +18442,7 @@
- "\167\110\320"
- , (PRUint32)1875 }
- };
--static const NSSItem nss_builtins_items_283 [] = {
-+static const NSSItem nss_builtins_items_281 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18624,7 +18473,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_284 [] = {
-+static const NSSItem nss_builtins_items_282 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18777,7 +18626,7 @@
- "\351\233\256\325\124\300\164\200\321\013\102\237\301"
- , (PRUint32)1869 }
- };
--static const NSSItem nss_builtins_items_285 [] = {
-+static const NSSItem nss_builtins_items_283 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18807,7 +18656,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_286 [] = {
-+static const NSSItem nss_builtins_items_284 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18943,7 +18792,7 @@
- "\242\355\264\324\265\145\103\267\223\106\212\323"
- , (PRUint32)1532 }
- };
--static const NSSItem nss_builtins_items_287 [] = {
-+static const NSSItem nss_builtins_items_285 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18973,7 +18822,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_288 [] = {
-+static const NSSItem nss_builtins_items_286 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19124,7 +18973,7 @@
- "\264"
- , (PRUint32)1761 }
- };
--static const NSSItem nss_builtins_items_289 [] = {
-+static const NSSItem nss_builtins_items_287 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19154,7 +19003,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_290 [] = {
-+static const NSSItem nss_builtins_items_288 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19290,7 +19139,7 @@
- "\111\043"
- , (PRUint32)1522 }
- };
--static const NSSItem nss_builtins_items_291 [] = {
-+static const NSSItem nss_builtins_items_289 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19320,7 +19169,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_292 [] = {
-+static const NSSItem nss_builtins_items_290 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19455,7 +19304,7 @@
- "\172\244\047\023\326\117\364\151"
- , (PRUint32)1512 }
- };
--static const NSSItem nss_builtins_items_293 [] = {
-+static const NSSItem nss_builtins_items_291 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19485,7 +19334,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_294 [] = {
-+static const NSSItem nss_builtins_items_292 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19621,7 +19470,7 @@
- "\302\021\254"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_295 [] = {
-+static const NSSItem nss_builtins_items_293 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19651,7 +19500,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_296 [] = {
-+static const NSSItem nss_builtins_items_294 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19787,7 +19636,7 @@
- "\147\024\060"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_297 [] = {
-+static const NSSItem nss_builtins_items_295 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19817,7 +19666,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_298 [] = {
-+static const NSSItem nss_builtins_items_296 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19951,7 +19800,7 @@
- "\217\116\235\306\066\347\134\246\253\022\017\326\317"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_299 [] = {
-+static const NSSItem nss_builtins_items_297 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19981,7 +19830,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_300 [] = {
-+static const NSSItem nss_builtins_items_298 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20115,7 +19964,7 @@
- "\130\113\161\203\237\146\346\254\171\110\376\376\107"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_301 [] = {
-+static const NSSItem nss_builtins_items_299 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20145,7 +19994,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_302 [] = {
-+static const NSSItem nss_builtins_items_300 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20280,7 +20129,7 @@
- "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
- , (PRUint32)1520 }
- };
--static const NSSItem nss_builtins_items_303 [] = {
-+static const NSSItem nss_builtins_items_301 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20310,7 +20159,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_304 [] = {
-+static const NSSItem nss_builtins_items_302 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20438,7 +20287,7 @@
- "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
- , (PRUint32)1392 }
- };
--static const NSSItem nss_builtins_items_305 [] = {
-+static const NSSItem nss_builtins_items_303 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20468,7 +20317,7 @@
-   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_306 [] = {
-+static const NSSItem nss_builtins_items_304 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20561,7 +20410,7 @@
- "\342\342\104\276\134\367\352\034\365"
- , (PRUint32)969 }
- };
--static const NSSItem nss_builtins_items_307 [] = {
-+static const NSSItem nss_builtins_items_305 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20589,7 +20438,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_308 [] = {
-+static const NSSItem nss_builtins_items_306 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20686,7 +20535,7 @@
- "\364"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_309 [] = {
-+static const NSSItem nss_builtins_items_307 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20715,7 +20564,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_310 [] = {
-+static const NSSItem nss_builtins_items_308 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20813,7 +20662,7 @@
- "\261\050\272"
- , (PRUint32)1011 }
- };
--static const NSSItem nss_builtins_items_311 [] = {
-+static const NSSItem nss_builtins_items_309 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20842,7 +20691,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_312 [] = {
-+static const NSSItem nss_builtins_items_310 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20919,7 +20768,7 @@
- "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_313 [] = {
-+static const NSSItem nss_builtins_items_311 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20943,7 +20792,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_314 [] = {
-+static const NSSItem nss_builtins_items_312 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21020,7 +20869,7 @@
- "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_315 [] = {
-+static const NSSItem nss_builtins_items_313 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21044,7 +20893,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_316 [] = {
-+static const NSSItem nss_builtins_items_314 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21153,7 +21002,7 @@
- "\051\340\266\270\011\150\031\034\030\103"
- , (PRUint32)1354 }
- };
--static const NSSItem nss_builtins_items_317 [] = {
-+static const NSSItem nss_builtins_items_315 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21177,7 +21026,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_318 [] = {
-+static const NSSItem nss_builtins_items_316 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21234,7 +21083,7 @@
- "\214\171"
- , (PRUint32)514 }
- };
--static const NSSItem nss_builtins_items_319 [] = {
-+static const NSSItem nss_builtins_items_317 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21258,7 +21107,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_320 [] = {
-+static const NSSItem nss_builtins_items_318 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21348,7 +21197,7 @@
- "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
- , (PRUint32)959 }
- };
--static const NSSItem nss_builtins_items_321 [] = {
-+static const NSSItem nss_builtins_items_319 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21375,7 +21224,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_322 [] = {
-+static const NSSItem nss_builtins_items_320 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21493,7 +21342,7 @@
- "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
- , (PRUint32)1440 }
- };
--static const NSSItem nss_builtins_items_323 [] = {
-+static const NSSItem nss_builtins_items_321 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21519,7 +21368,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_324 [] = {
-+static const NSSItem nss_builtins_items_322 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21652,7 +21501,7 @@
- "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
- , (PRUint32)1679 }
- };
--static const NSSItem nss_builtins_items_325 [] = {
-+static const NSSItem nss_builtins_items_323 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21678,7 +21527,7 @@
-   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_326 [] = {
-+static const NSSItem nss_builtins_items_324 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21772,7 +21621,7 @@
- "\204\232\315"
- , (PRUint32)979 }
- };
--static const NSSItem nss_builtins_items_327 [] = {
-+static const NSSItem nss_builtins_items_325 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21800,7 +21649,7 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_328 [] = {
-+static const NSSItem nss_builtins_items_326 [] = {
-   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21884,7 +21733,7 @@
- "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
- , (PRUint32)895 }
- };
--static const NSSItem nss_builtins_items_329 [] = {
-+static const NSSItem nss_builtins_items_327 [] = {
-   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -22242,13 +22091,11 @@
-   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
-   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
-   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
--  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
--  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
--  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
-+  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
- };
- const PRUint32
- #ifdef DEBUG
--  nss_builtins_nObjects = 329+1;
-+  nss_builtins_nObjects = 327+1;
- #else
--  nss_builtins_nObjects = 329;
-+  nss_builtins_nObjects = 327;
- #endif /* DEBUG */
-Index: security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
-retrieving revision 1.64.2.10
-retrieving revision 1.64.2.11
-diff -u -r1.64.2.10 -r1.64.2.11
---- security/nss/lib/ckfw/builtins/certdata.txt	1 Aug 2011 06:40:04 -0000	1.64.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.txt	30 Aug 2011 20:04:39 -0000	1.64.2.11
-@@ -34,7 +34,7 @@
- # the terms of any one of the MPL, the GPL or the LGPL.
- #
- # ***** END LICENSE BLOCK *****
--CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
-+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
- 
- #
- # certdata.txt
-@@ -12461,161 +12461,6 @@
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
- 
- #
--# Certificate "DigiNotar 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 "DigiNotar Root CA"
--CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
--CKA_SUBJECT MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_ID UTF8 "0"
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_VALUE MULTILINE_OCTAL
--\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
--\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
--\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
--\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
--\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
--\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
--\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
--\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
--\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
--\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
--\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
--\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
--\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
--\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
--\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
--\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
--\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
--\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\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
--\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
--\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
--\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
--\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
--\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
--\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
--\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
--\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
--\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
--\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
--\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
--\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
--\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
--\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
--\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
--\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
--\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
--\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
--\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
--\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
--\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
--\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
--\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
--\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
--\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
--\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
--\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
--\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
--\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
--\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
--\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
--\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
--\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
--\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
--\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
--\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
--\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
--\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
--\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
--\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
--\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
--\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
--\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
--\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
--\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
--\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
--\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
--\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
--\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
--\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
--\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
--\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
--\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
--\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
--\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
--\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
--\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
--\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
--\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
--\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
--\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
--\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
--\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
--\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
--\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
--\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
--\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
--\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
--\262\345\214\360\206\231\270\345\305\337\204\301\267\353
--END
--
--# Trust for Certificate "DigiNotar 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 "DigiNotar Root CA"
--CKA_CERT_SHA1_HASH MULTILINE_OCTAL
--\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
--\201\147\107\214
--END
--CKA_CERT_MD5_HASH MULTILINE_OCTAL
--\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
--END
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
--
--#
- # Certificate "Network Solutions Certificate Authority"
- #
- CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-Index: security/nss/lib/ckfw/builtins/nssckbi.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
-retrieving revision 1.24.2.5
-retrieving revision 1.24.2.6
-diff -u -r1.24.2.5 -r1.24.2.6
---- security/nss/lib/ckfw/builtins/nssckbi.h	1 Aug 2011 06:40:04 -0000	1.24.2.5
-+++ security/nss/lib/ckfw/builtins/nssckbi.h	30 Aug 2011 20:04:40 -0000	1.24.2.6
-@@ -77,8 +77,8 @@
-  * of the comment in the CK_VERSION type definition.
-  */
- #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
--#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
--#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
-+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
-+#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
- 
- /* These version numbers detail the semantic changes to the ckfw engine. */
- #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/staging/alsa-plugins/PKGBUILD b/staging/alsa-plugins/PKGBUILD
new file mode 100644
index 000000000..27bc024c3
--- /dev/null
+++ b/staging/alsa-plugins/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 141604 2011-10-31 16:09:16Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
+
+pkgname=alsa-plugins
+pkgver=1.0.24
+pkgrel=3
+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")
+md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
+}
diff --git a/staging/avidemux/PKGBUILD b/staging/avidemux/PKGBUILD
new file mode 100644
index 000000000..c8edef3f7
--- /dev/null
+++ b/staging/avidemux/PKGBUILD
@@ -0,0 +1,120 @@
+# $Id: PKGBUILD 141619 2011-10-31 21:13:23Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
+pkgver=2.5.5
+pkgrel=5
+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')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
+        avidemux-2.5.4-x264-build115.patch)
+md5sums=('33bbe210c6826cea1987ed18a41d57a7'
+         '24a18b53a58b678b9e87d30566985751')
+
+build() {
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+
+  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
+
+  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')
+  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-2.5.4-x264-build115.patch b/staging/avidemux/avidemux-2.5.4-x264-build115.patch
new file mode 100644
index 000000000..c627667ec
--- /dev/null
+++ b/staging/avidemux/avidemux-2.5.4-x264-build115.patch
@@ -0,0 +1,45 @@
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
+@@ -488,8 +488,10 @@
+ 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
+@@ -417,7 +417,7 @@
+ 	_param.b_cabac = cabac;
+ }
+ 
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ 	return _param.i_open_gop;
+@@ -428,6 +428,17 @@
+ 	if (openGopMode < 3)
+ 		_param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++        return _param.b_open_gop;
++}
++ 
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++        if (openGopMode < 3)
++                _param.b_open_gop = openGopMode;
++}
+ #endif
+ 
+ unsigned int x264Options::getInterlaced(void)
diff --git a/community-testing/sigil/sigil.install b/staging/avidemux/avidemux.install
index ec506fa93..e111ef946 100644
--- a/community-testing/sigil/sigil.install
+++ b/staging/avidemux/avidemux.install
@@ -1,6 +1,5 @@
 post_install() {
   update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
diff --git a/staging/blender/PKGBUILD b/staging/blender/PKGBUILD
new file mode 100644
index 000000000..e658c2966
--- /dev/null
+++ b/staging/blender/PKGBUILD
@@ -0,0 +1,93 @@
+# $Id: PKGBUILD 141598 2011-10-31 15:34:24Z pierre $
+# Contributor: John Sowiak <john@archlinux.org>
+# Maintainer: tobias <tobias@archlinux.org>
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.60a
+pkgrel=2
+epoch=3
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.blender.org"
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
+         'freetype2' 'openal' 'libsndfile' 'ffmpeg')
+makedepends=('cmake')
+install=blender.install
+if [ $_svn = false ]; then
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
+else
+  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
+  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
+fi
+
+# source PKGBUILD && mksource
+mksource() {
+  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+  _svnver=38016
+  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
+  _svnmod="$pkgname-$pkgver"
+  mkdir ${pkgname}-$pkgver
+  pushd ${pkgname}-$pkgver
+  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+  find . -depth -type d -name .svn -exec rm -rf {} \;
+  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
+  popd
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir build
+  cd build
+
+  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_PYTHON_INSTALL:BOOL=OFF \
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DWITH_BUILTIN_GLEW:BOOL=OFF \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
+    -DPYTHON_VERSION:STRING=3.2 \
+    -DPYTHON_LIBPATH:STRING=/usr/lib \
+    -DPYTHON_LIBRARY:STRING=python3.2mu \
+    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
+    $ENABLESSE2
+
+  make $MAKEFLAGS
+
+  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
+    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
+  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
+  chmod 755 bmake
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/build"
+  make DESTDIR="${pkgdir}" install
+  python -m compileall "${pkgdir}/usr/share/blender"
+
+# install plugins
+  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
+}
diff --git a/community-staging/sigil/sigil.install b/staging/blender/blender.install
index ec506fa93..724bfce00 100644
--- a/community-staging/sigil/sigil.install
+++ b/staging/blender/blender.install
@@ -1,5 +1,6 @@
 post_install() {
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
diff --git a/staging/cmus/PKGBUILD b/staging/cmus/PKGBUILD
new file mode 100644
index 000000000..811591786
--- /dev/null
+++ b/staging/cmus/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 141608 2011-10-31 19:08:31Z ibiru $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=cmus
+pkgver=2.4.2
+pkgrel=2
+pkgdesc="A very feature-rich ncurses-based music player"
+arch=('i686' 'x86_64')
+url="http://cmus.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
+             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
+optdepends=('alsa-lib: for ALSA output plugin support'
+            'libao: for AO output plugin support'
+            'libpulse: for PulseAudio output plugin support'
+            'ffmpeg: for ffmpeg input plugin support'
+            'libmodplug: for modplug input plugin support'
+            'faad2: for input AAC plugin support'
+            'libmad: for mp3 input plugin support'
+            'libmpcdec: for musepack input plugin support'
+            'wavpack: for wavpack input plugin support'
+            'libvorbis: for vorbis input plugin support'
+            'flac: for flac input plugin support'
+            'libmp4v2: for mp4 input plugin support')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
+md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
+sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
+
+build() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
+}
diff --git a/staging/ffmpeg/PKGBUILD b/staging/ffmpeg/PKGBUILD
new file mode 100644
index 000000000..d116a29f2
--- /dev/null
+++ b/staging/ffmpeg/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 141586 2011-10-31 13:57:20Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=ffmpeg
+pkgver=20111030
+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=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+makedepends=('yasm' 'git')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
+md5sums=('414bbe4184530f82368f4a29e3e71b51')
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-libxvid \
+    --enable-libx264 \
+    --enable-libvpx \
+    --enable-libtheora \
+    --enable-postproc \
+    --enable-shared \
+    --enable-x11grab \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libschroedinger \
+    --enable-libopenjpeg \
+    --enable-librtmp \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
+    --disable-debug \
+    --disable-static
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install install-man
+  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/staging/gegl/0.1.6-ffmpeg.patch b/staging/gegl/0.1.6-ffmpeg.patch
new file mode 100644
index 000000000..51fb95d28
--- /dev/null
+++ b/staging/gegl/0.1.6-ffmpeg.patch
@@ -0,0 +1,33 @@
+diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
+--- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
++++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
+@@ -69,17 +69,17 @@
+ {
+   switch (err)
+     {
+-    case AVERROR_NUMEXPECTED:
++    case AVERROR(EDOM):
+       g_warning ("%s: Incorrect image filename syntax.\n"
+                  "Use '%%d' to specify the image number:\n"
+                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
+                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
+                  filename);
+       break;
+-    case AVERROR_INVALIDDATA:
++    case AVERROR(EINVAL):
+       g_warning ("%s: Error while parsing header\n", filename);
+       break;
+-    case AVERROR_NOFMT:
++    case AVERROR(EILSEQ):
+       g_warning ("%s: Unknown format\n", filename);
+       break;
+     default:
+@@ -278,7 +278,7 @@
+       for (i = 0; i< p->ic->nb_streams; i++)
+         {
+           AVCodecContext *c = p->ic->streams[i]->codec;
+-          if (c->codec_type == CODEC_TYPE_VIDEO)
++          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
+             {
+               p->video_st = p->ic->streams[i];
+               p->video_stream = i;
diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD
new file mode 100644
index 000000000..9bade16e0
--- /dev/null
+++ b/staging/gegl/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 141633 2011-11-01 00:51:56Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=gegl
+pkgver=0.1.6
+pkgrel=2
+pkgdesc="Graph based image processing framework"
+arch=('i686' 'x86_64')
+url="http://www.gegl.org/"
+license=('GPL3' 'LGPL3')
+depends=('babl' 'gtk2')
+makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
+optdepends=('openexr: for using the openexr plugin' \
+            'ffmpeg: for using the ffmpeg plugin' \
+            'librsvg: for using the svg plugin' \
+            'jasper: for using the jasper plugin')
+options=('!libtool')
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \
+        0.1.6-ffmpeg.patch)
+sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
+          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch"
+  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
+    --with-libavformat --with-jasper --disable-docs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD
new file mode 100644
index 000000000..6209ec3b4
--- /dev/null
+++ b/staging/gstreamer0.10-ugly/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 141590 2011-10-31 14:41:06Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gstreamer0.10-ugly
+pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
+pkgver=0.10.18
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+url="http://gstreamer.freedesktop.org/"
+options=(!libtool)
+source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
+md5sums=('04a7009a4efea2844075949c111f5e4d')
+
+build() {
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
+}
+
+package_gstreamer0.10-ugly() {
+  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
+  depends=('gstreamer0.10-base>=0.10.34')
+  
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gstreamer0.10-ugly-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
+  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+  groups=('gstreamer0.10-plugins')
+  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make -C ext DESTDIR="${pkgdir}" install
+}
diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
new file mode 100644
index 000000000..0ed6c97f6
--- /dev/null
+++ b/staging/kdeaccessibility/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id: PKGBUILD 141578 2011-10-31 11:33:57Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdeaccessibility
+pkgname=('kdeaccessibility-jovie'
+         'kdeaccessibility-kaccessible'
+         'kdeaccessibility-kmag'
+         'kdeaccessibility-kmousetool'
+         'kdeaccessibility-kmouth')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://accessibility.kde.org'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('9695d2b8b6f55266e3f76ebf05543f23857b9520')
+
+build() {
+	cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package_kdeaccessibility-jovie() {
+	pkgdesc='A text to speech application'
+	depends=('kdebase-runtime' 'speech-dispatcher')
+    replaces=('kdeaccessibility-kttsd')
+	install='kdeaccessibility.install'
+	cd $srcdir/build/jovie
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/jovie/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeaccessibility-kaccessible() {
+    pkgdesc='Provides accessibility services like focus tracking and a screenreader'
+    depends=('kdebase-runtime' 'speech-dispatcher')
+	install='kdeaccessibility.install'
+    cd $srcdir/build/kaccessible
+    make DESTDIR=$pkgdir install
+}
+
+package_kdeaccessibility-kmag() {
+	pkgdesc='Screen Magnifier'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kmag/"
+	install='kdeaccessibility.install'
+	cd $srcdir/build/kmag
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kmag/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeaccessibility-kmousetool() {
+	pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kmousetool/"
+	install='kdeaccessibility.install'
+	cd $srcdir/build/kmousetool
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kmousetool/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeaccessibility-kmouth() {
+	pkgdesc='Speech Synthesizer Frontend'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kmouth/"
+	install='kdeaccessibility.install'
+	cd $srcdir/build/kmouth
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kmouth/doc
+	make DESTDIR=$pkgdir install
+}
diff --git a/community-staging/qbittorrent/qbittorrent.install b/staging/kdeaccessibility/kdeaccessibility.install
index e70c054ec..e70c054ec 100644
--- a/community-staging/qbittorrent/qbittorrent.install
+++ b/staging/kdeaccessibility/kdeaccessibility.install
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
index 3e541e11d..0a63ec61b 100644
--- a/staging/kdebase-workspace/PKGBUILD
+++ b/staging/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141514 2011-10-31 03:38:12Z andrea $
+# $Id: PKGBUILD 141627 2011-10-31 22:51:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -33,7 +33,8 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'fix-powerprofiles.patch')
 sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -42,7 +43,8 @@ sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          '7c514a0727f904359d2ab12078e9868488ded3e6')
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
@@ -51,6 +53,8 @@ build() {
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
 
+    patch -Rp1 -i "${srcdir}"/fix-powerprofiles.patch
+
 	cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/staging/kdebase-workspace/fix-powerprofiles.patch b/staging/kdebase-workspace/fix-powerprofiles.patch
new file mode 100644
index 000000000..309fcf3db
--- /dev/null
+++ b/staging/kdebase-workspace/fix-powerprofiles.patch
@@ -0,0 +1,23 @@
+From: Dario Freddi <drf@kde.org>
+Date: Tue, 04 Oct 2011 14:09:09 +0000
+Subject: Use full config when reading settings
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=8d59876457387d1c72ca3626ae2d267adf100014
+---
+Use full config when reading settings
+
+BUG: 267323
+---
+
+
+--- a/powerdevil/daemon/powerdevilcore.cpp
++++ b/powerdevil/daemon/powerdevilcore.cpp
+@@ -88,7 +88,7 @@ void Core::onBackendReady()
+ {
+     kDebug() << "Backend is ready, KDE Power Management system initialized";
+ 
+-    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);
++    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig);
+ 
+     // Is it brand new?
+     if (m_profilesConfig->groupList().isEmpty()) {
+
diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
new file mode 100644
index 000000000..714f5b2b5
--- /dev/null
+++ b/staging/kdeedu-parley/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141544 2011-10-31 04:03:42Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-parley
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Vocabulary Trainer"
+url="http://kde.org/applications/education/parley/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
+sha1sums=('a5d06f373976554d58c8aae279e411a6be028826')
+
+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
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdeedu-parley/kdeedu-parley.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..79c6074f0
--- /dev/null
+++ b/staging/kdeedu-rocs/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141545 2011-10-31 04:04:32Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-rocs
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Rocs Graph Theory"
+url="http://kde.org/applications/education/rocs/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
+sha1sums=('5c7d4115f029e09a006912bf816d4ce396a9b49a')
+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
new file mode 100644
index 000000000..bcdce95b2
--- /dev/null
+++ b/staging/kdeedu-step/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141546 2011-10-31 04:05:18Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-step
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Interactive Physical Simulator"
+url="http://kde.org/applications/education/step/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
+sha1sums=('411695882916a8a1d0db86426a0d8f935fab21ad')
+
+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/community-testing/qbittorrent/qbittorrent.install b/staging/kdeedu-step/kdeedu-step.install
index e70c054ec..e70c054ec 100644
--- a/community-testing/qbittorrent/qbittorrent.install
+++ b/staging/kdeedu-step/kdeedu-step.install
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
new file mode 100644
index 000000000..9cdb3e8f1
--- /dev/null
+++ b/staging/kdegames/PKGBUILD
@@ -0,0 +1,515 @@
+# $Id: PKGBUILD 141547 2011-10-31 04:09:11Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdegames
+pkgname=('kdegames-bomber'
+         'kdegames-bovo'
+         'kdegames-granatier'
+         'kdegames-kajongg'
+         'kdegames-kapman'
+         'kdegames-katomic'
+         'kdegames-kbattleship'
+         'kdegames-kblackbox'
+         'kdegames-kblocks'
+         'kdegames-kbounce'
+         'kdegames-kbreakout'
+         'kdegames-kdiamond'
+         'kdegames-kfourinline'
+         'kdegames-kgoldrunner'
+         'kdegames-kigo'
+         'kdegames-killbots'
+         'kdegames-kiriki'
+         'kdegames-kjumpingcube'
+         'kdegames-klines'
+         'kdegames-klickety'
+         'kdegames-kmahjongg'
+         'kdegames-kmines'
+         'kdegames-knetwalk'
+         'kdegames-kolf'
+         'kdegames-kollision'
+         'kdegames-konquest'
+         'kdegames-kpatience'
+         'kdegames-kreversi'
+         'kdegames-kshisen'
+         'kdegames-ksirk'
+         'kdegames-kspaceduel'
+         'kdegames-ksquares'
+         'kdegames-ksudoku'
+         'kdegames-ktron'
+         'kdegames-ktuberling'
+         'kdegames-kubrick'
+         'kdegames-libkdegames'
+         'kdegames-libkmahjongg'
+         'kdegames-lskat'
+         'kdegames-palapeli')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegames')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
+             'kdebindings-python' 'openal')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('abd90be42fa67cd6d6be1defe90dcd0408e94445')
+
+build() {
+	cd $srcdir
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
+	make
+}
+
+package_kdegames-bomber() {
+	pkgdesc='Arcade Bombing Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/bomber/"
+	install='kdegames.install'
+	cd $srcdir/build/bomber
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/bomber
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-bovo() {
+	pkgdesc='Five-in-a-row Board Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/bovo/"
+	install='kdegames.install'
+	cd $srcdir/build/bovo
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/bovo
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-granatier() {
+	pkgdesc='Granatier'
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
+	url="http://kde.org/applications/games/granatier/"
+	install='kdegames.install'
+	cd $srcdir/build/granatier
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/granatier
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kajongg() {
+	pkgdesc='The ancient Chinese board game for 4 players'
+	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
+	install='kdegames.install'
+	cd $srcdir/build/kajongg
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kajongg
+	make DESTDIR=$pkgdir install
+
+	# Use the python2 executable
+	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
+
+package_kdegames-kapman() {
+	pkgdesc='Eat pills escaping ghosts'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kapman/"
+	install='kdegames.install'
+	cd $srcdir/build/kapman
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kapman
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-katomic() {
+	pkgdesc='Sokoban-like Logic Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/katomic/"
+	install='kdegames.install'
+	cd $srcdir/build/katomic
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/katomic
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kbattleship() {
+	pkgdesc='Battleship Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
+	url="http://kde.org/applications/games/kbattleship/"
+	install='kdegames-kbattleship.install'
+	cd $srcdir/build/kbattleship
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kbattleship
+	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
+		$pkgdir/usr/share/ggz/kbattleship.dsc
+}
+
+package_kdegames-kblackbox() {
+	pkgdesc='Blackbox Logic Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kblackbox/"
+	install='kdegames.install'
+	cd $srcdir/build/kblackbox
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kblackbox
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kblocks() {
+	pkgdesc='Falling Blocks Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kblocks/"
+	install='kdegames.install'
+	cd $srcdir/build/kblocks
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kblocks
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kbounce() {
+	pkgdesc='Ball Bouncing Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kbounce/"
+	install='kdegames.install'
+	cd $srcdir/build/kbounce
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kbounce
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kbreakout() {
+	pkgdesc='Breakout-like Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kbreakout/"
+	install='kdegames.install'
+	cd $srcdir/build/kbreakout
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kbreakout
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kdiamond() {
+	pkgdesc='Three-in-a-row game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kdiamond/"
+	install='kdegames.install'
+	cd $srcdir/build/kdiamond
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kdiamond
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kfourinline() {
+	pkgdesc='Four-in-a-row Board Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kfourinline/"
+	install='kdegames-kfourinline.install'
+	cd $srcdir/build/kfourinline
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kfourinline
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kgoldrunner() {
+	pkgdesc='A game of action and puzzle-solving'
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
+	url="http://kde.org/applications/games/kgoldrunner/"
+	install='kdegames.install'
+	cd $srcdir/build/kgoldrunner
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kgoldrunner
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kigo() {
+	pkgdesc='Go Board Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
+	url="http://kde.org/applications/games/kigo/"
+	install='kdegames-kigo.install'
+	cd $srcdir/build/kigo
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kigo
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-killbots() {
+	pkgdesc='Killbots'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/killbots/"
+	install='kdegames.install'
+	cd $srcdir/build/killbots
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/killbots
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kiriki() {
+	pkgdesc='Yahtzee-like Dice Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kiriki/"
+	install='kdegames.install'
+	cd $srcdir/build/kiriki
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kiriki
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kjumpingcube() {
+	pkgdesc='Territory Capture Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kjumpingcube/"
+	install='kdegames.install'
+	cd $srcdir/build/kjumpingcube
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kjumpingcube
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-klickety() {
+	pkgdesc='Board Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	replaces=('kdegames-ksame')
+	conflicts=('kdegames-ksame')
+	url="http://kde.org/applications/games/ksame/"
+	install='kdegames.install'
+	cd $srcdir/build/klickety
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/klickety
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-klines() {
+	pkgdesc='Tactical Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/klines/"
+	install='kdegames.install'
+	cd $srcdir/build/klines
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/klines
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kmahjongg() {
+	pkgdesc='Mahjongg Solitaire'
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
+	url="http://kde.org/applications/games/kmahjongg/"
+	install='kdegames.install'
+	cd $srcdir/build/kmahjongg
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmahjongg
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kmines() {
+	pkgdesc='Minesweeper-like Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kmines/"
+	install='kdegames.install'
+	cd $srcdir/build/kmines
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmines
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-knetwalk() {
+	pkgdesc='Network Construction Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/knetwalk/"
+	install='kdegames.install'
+	cd $srcdir/build/knetwalk
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/knetwalk
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kolf() {
+	pkgdesc='Miniature Golf'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kolf/"
+	install='kdegames-kolf.install'
+	cd $srcdir/build/kolf
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kolf
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kollision() {
+	pkgdesc='A simple ball dodging game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kollision/"
+	install='kdegames.install'
+	cd $srcdir/build/kollision
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kollision
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-konquest() {
+	pkgdesc='Galactic Strategy Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/konquest/"
+	install='kdegames.install'
+	cd $srcdir/build/konquest
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/konquest
+	make DESTDIR=$pkgdir install
+}
+
+package_kdegames-kpatience() {
+	pkgdesc='Patience Card Game'
+	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	url="http://kde.org/applications/games/kpatience/"
+	install='kdegames.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
new file mode 100644
index 000000000..ac4516ed0
--- /dev/null
+++ b/staging/kdegames/kdegames-kbattleship.install
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-kfourinline.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-kigo.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-kolf.install
@@ -0,0 +1,12 @@
+post_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-kreversi.install b/staging/kdegames/kdegames-kreversi.install
new file mode 100644
index 000000000..4623e6e49
--- /dev/null
+++ b/staging/kdegames/kdegames-kreversi.install
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-kspaceduel.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..5a619897d
--- /dev/null
+++ b/staging/kdegames/kdegames-ksquares.install
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-ktuberling.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/staging/kdegames/kdegames-lskat.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/staging/kdegames/kdegames-palapeli.install
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdegames/kdegames.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..1813e5dca
--- /dev/null
+++ b/staging/kdegraphics-gwenview/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 141548 2011-10-31 04:11:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-gwenview
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="A fast and easy to use image viewer for KDE"
+url="http://kde.org/applications/graphics/gwenview/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-lib' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins: extra plugins to share photos')
+install=$pkgname.install
+source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
+sha1sums=('7096721285d15311699acc76abd62755d6e93860')
+
+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
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..200c185f1
--- /dev/null
+++ b/staging/kdegraphics-kamera/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 141549 2011-10-31 04:11:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kamera
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Configure Kamera"
+url="http://kde.org/applications/graphics/kamera/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'gphoto2')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
+sha1sums=('820f9b6449732f6cab48f5c2d9e7dbcf53eb6437')
+
+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
new file mode 100644
index 000000000..d2e223249
--- /dev/null
+++ b/staging/kdegraphics-kcolorchooser/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141550 2011-10-31 04:12:19Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kcolorchooser
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Color Chooser"
+url="http://kde.org/applications/graphics/kcolorchooser/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
+sha1sums=('bdd35e5defbcfc151f4960541c351246cb4dfa9e')
+
+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
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..1dccd786c
--- /dev/null
+++ b/staging/kdegraphics-kgamma/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 141551 2011-10-31 04:12:46Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kgamma
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="A monitor calibration tool"
+url="http://kde.org/applications/graphics/kgamma/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+# note on libxxf86vm:
+#       not detected by namcap because libgl depends on it
+#       but nvidia providing libgl does not depend on libxxf86vm
+depends=('kdebase-runtime' 'libxxf86vm')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
+sha1sums=('d97511574120614ffb85308888c23eb2d3ba1b01')
+
+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
new file mode 100644
index 000000000..6f88fd91b
--- /dev/null
+++ b/staging/kdegraphics-kolourpaint/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141552 2011-10-31 04:13:31Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kolourpaint
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Paint Program"
+url="http://kde.org/applications/graphics/kolourpaint/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'qimageblitz')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
+sha1sums=('d276d230e76f7fbe91229dd015a6465cb1a6956e')
+
+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
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..ab4516da1
--- /dev/null
+++ b/staging/kdegraphics-kruler/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141553 2011-10-31 04:14:21Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kruler
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Screen Ruler"
+url="http://kde.org/applications/graphics/kruler/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
+sha1sums=('2cc0b9d31248604ab570404a0c67ef325e8ed00e')
+
+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
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdegraphics-kruler/kdegraphics-kruler.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..f3b2c53af
--- /dev/null
+++ b/staging/kdegraphics-ksaneplugin/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141554 2011-10-31 04:14:57Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksaneplugin
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="A scan plugin that implements the scanning"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libksane')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
+sha1sums=('547c298e2f3f7b8f651e3402bf18507321d4a7ce')
+
+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
new file mode 100644
index 000000000..893196c9b
--- /dev/null
+++ b/staging/kdegraphics-ksnapshot/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 141555 2011-10-31 04:15:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksnapshot
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Screen Capture Program"
+url="http://kde.org/applications/graphics/ksnapshot/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdelibs' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
+sha1sums=('e0dd6e093cd487fa6604077371122d84b3e8efb7')
+
+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
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
@@ -0,0 +1,12 @@
+post_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
new file mode 100644
index 000000000..cc2b96ac8
--- /dev/null
+++ b/staging/kdegraphics-mobipocket/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141556 2011-10-31 04:16:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-mobipocket
+pkgver=4.7.3
+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')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
+sha1sums=('a55908cbc951c98dd27171909c1ccc5d978eec65')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../mobipocket-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
new file mode 100644
index 000000000..563ece77a
--- /dev/null
+++ b/staging/kdegraphics-strigi-analyzer/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141557 2011-10-31 04:16:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-strigi-analyzer
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Strigi analyzers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('827b18fd902a464162db7a3cd98a22fa211bafc9')
+
+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
new file mode 100644
index 000000000..cab788924
--- /dev/null
+++ b/staging/kdegraphics-svgpart/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141558 2011-10-31 04:17:00Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-svgpart
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="A KPart for viewving SVGs"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
+sha1sums=('fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7')
+
+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
new file mode 100644
index 000000000..e2b966f86
--- /dev/null
+++ b/staging/kdegraphics-thumbnailers/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141559 2011-10-31 04:17:26Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-thumbnailers
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="Thumbnailers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libkexiv2' 'libkdcraw')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('219fd55d94d695cee8c7b650dbe8088cc9807e5c')
+
+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/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
new file mode 100644
index 000000000..a6ef52513
--- /dev/null
+++ b/staging/kdemultimedia/PKGBUILD
@@ -0,0 +1,109 @@
+# $Id: PKGBUILD 141560 2011-10-31 04:18:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdemultimedia
+pkgname=('kdemultimedia-dragonplayer'
+         'kdemultimedia-ffmpegthumbs'
+         'kdemultimedia-juk'
+         'kdemultimedia-kioslave'
+         'kdemultimedia-kmix'
+         'kdemultimedia-kscd'
+         'kdemultimedia-mplayerthumbs')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdemultimedia')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
+            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'mplayerthumbs.config')
+sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff'
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
+
+build() {
+    cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DWITH_Xine=OFF
+	make
+}
+
+package_kdemultimedia-dragonplayer() {
+	pkgdesc='Video Player'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/multimedia/dragonplayer/"
+	install='kdemultimedia.install'
+	cd $srcdir/build/dragonplayer
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/dragonplayer
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-ffmpegthumbs() {
+	pkgdesc='Video Files (ffmpegthumbs)'
+	depends=('kdebase-runtime' 'ffmpeg')
+	install='kdemultimedia.install'
+	cd $srcdir/build/ffmpegthumbs
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-juk() {
+	pkgdesc='Music Player'
+	depends=('kdebase-runtime' 'tunepimp')
+	url="http://kde.org/applications/multimedia/juk"
+	install='kdemultimedia.install'
+	cd $srcdir/build/juk
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/juk
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-kioslave() {
+	pkgdesc='Audio CD Browser'
+	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
+	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
+	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
+	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
+}
+
+package_kdemultimedia-kmix() {
+	pkgdesc='Sound Mixer'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/multimedia/kmix"
+	install='kdemultimedia.install'
+	cd $srcdir/build/kmix
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmix
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-kscd() {
+	pkgdesc='CD Player'
+	depends=('kdebase-runtime' 'libmusicbrainz3')
+	url="http://kde.org/applications/multimedia/kscd"
+	install='kdemultimedia.install'
+	cd $srcdir/build/kscd
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kcontrol/cddbretrieval
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-mplayerthumbs() {
+	pkgdesc='Video Files (MPlayerThumbs)'
+	depends=('kdebase-runtime' 'mplayer')
+	replaces=('mplayerthumbs')
+	conflicts=('mplayerthumbs')
+	cd $srcdir/build/mplayerthumbs
+	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
+}
diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdemultimedia/kdemultimedia.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..761a17953
--- /dev/null
+++ b/staging/kdemultimedia/mplayerthumbs.config
@@ -0,0 +1,2 @@
+[MPlayerThumbsCfg]
+backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
new file mode 100644
index 000000000..82f8a130b
--- /dev/null
+++ b/staging/kdenetwork/PKGBUILD
@@ -0,0 +1,111 @@
+# $Id: PKGBUILD 141561 2011-10-31 04:19:15Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+         'kdenetwork-kdnssd'
+         'kdenetwork-kget'
+         'kdenetwork-kopete'
+         'kdenetwork-kppp'
+         'kdenetwork-krdc'
+         'kdenetwork-krfb')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
+    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7')
+
+build() {
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+        -DWITH_Xmms=OFF \
+		-DWITH_LibMeanwhile=OFF
+	make
+}
+
+package_kdenetwork-filesharing() {
+	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
+	depends=('kdelibs' 'smbclient')
+	install='kdenetwork.install'
+	cd $srcdir/build/filesharing
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+	pkgdesc='Monitors the network for DNS-SD services'
+	depends=('kdelibs')
+	cd $srcdir/build/kdnssd
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+	pkgdesc='Download Manager'
+	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+	optdepends=('python2: YouTube plugin')
+	url="http://kde.org/applications/internet/kget/"
+	install='kdenetwork.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' 'v4l-utils' 'libgadu' 'mediastreamer')
+	url="http://kde.org/applications/internet/kopete/"
+	install='kdenetwork.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.install'
+	cd $srcdir/build/kppp
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kppp
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+	pkgdesc='Remote Desktop Client'
+	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
+    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
+	url="http://kde.org/applications/internet/krdc/"
+	cd $srcdir/build/krdc
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krdc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+	pkgdesc='Desktop Sharing'
+	# note on libxdamage:
+	#       not detected by namcap because libgl depends on it
+	#       but nvidia providing libgl does not depend on libxdamage
+	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
+	cd $srcdir/build/krfb
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krfb
+	make DESTDIR=$pkgdir install
+}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdenetwork/kdenetwork.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
new file mode 100644
index 000000000..a3499afe3
--- /dev/null
+++ b/staging/kdepim/PKGBUILD
@@ -0,0 +1,252 @@
+# $Id: PKGBUILD 141562 2011-10-31 04:20:16Z 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'
+         'kdepim-wizards')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
+             'pilot-link' 'kde-agent')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('b540de51ba5b9995ce3b7c05cfb09112423d8569')
+
+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')
+	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.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 \
+		nepomuk_email_feeder 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.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
+}
+
+package_kdepim-wizards() {
+	pkgdesc='KDE Groupware Wizard'
+	depends=('kdepim-kresources')
+	url='http://pim.kde.org'
+	cd "${srcdir}"/build/wizards
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdepim/kdepim.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
new file mode 100644
index 000000000..0a7aaf495
--- /dev/null
+++ b/staging/kdeplasma-addons/PKGBUILD
@@ -0,0 +1,603 @@
+# $Id: PKGBUILD 141563 2011-10-31 04:21:38Z 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-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-virus'
+         'kdeplasma-addons-wallpapers-weather')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+groups=('kde' 'kdeplasma-addons')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
+             'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('decdea2d081396c90daabc9af754a233b43a0783')
+
+build() {
+    cd "${srcdir}"
+	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-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-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' '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')
+	optdepends=('scim: SCIM backend'
+		'fcitx: FCITX 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')
+	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')
+	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' 'kdeplasma-addons-libs')
+	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' 'kdeplasma-addons-libs')
+	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' 'kdeplasma-addons-libs')
+	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-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
new file mode 100644
index 000000000..ce5c32e1b
--- /dev/null
+++ b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..c4ef46ba8
--- /dev/null
+++ b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
@@ -0,0 +1,11 @@
+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/PKGBUILD b/staging/kdesdk/PKGBUILD
new file mode 100644
index 000000000..3804d4b56
--- /dev/null
+++ b/staging/kdesdk/PKGBUILD
@@ -0,0 +1,247 @@
+# $Id: PKGBUILD 141564 2011-10-31 04:23:09Z 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-kspy'
+         'kdesdk-kstartperf'
+         'kdesdk-kuiviewer'
+         'kdesdk-lokalize'
+         'kdesdk-okteta'
+         'kdesdk-poxml'
+#         'kdesdk-scheck'
+         'kdesdk-scripts'
+         'kdesdk-strigi-analyzer'
+         'kdesdk-umbrello')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdesdk')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
+             'kdepimlibs' 'kdebase-lib')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'fix-python2-path.patch')
+sha1sums=('c0afae643345c92bce387ceafbcea59d3fbd812e'
+          'd05ca0231869c484fd3861955d960a60aff7dcfb')
+
+build() {
+	cd ${srcdir}/${pkgbase}-${pkgver}
+
+	# Fix python2 path
+	patch -Np1 -i ${srcdir}/fix-python2-path.patch
+	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+		-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+		$(find . -name '*.py')
+
+	cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package_kdesdk-cervisia() {
+	pkgdesc='CVS Frontend'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/development/cervisia/"
+	install='kdesdk.install'
+	cd $srcdir/build/cervisia
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/cervisia
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-dolphin-plugins() {
+	pkgdesc='Extra Dolphin plugins'
+	depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
+	install='kdesdk.install'
+	cd $srcdir/build/dolphin-plugins/git
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/dolphin-plugins/svn
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kapptemplate() {
+	pkgdesc='KDE Template Generator'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/development/kapptemplate/"
+	install='kdesdk.install'
+	cd $srcdir/build/kapptemplate
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kapptemplate
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kcachegrind() {
+	pkgdesc='Visualization of Performance Profiling Data'
+	depends=('kdebase-runtime' 'python2')
+	optdepends=('php: PHP support')
+	url="http://kde.org/applications/development/kcachegrind/"
+	install='kdesdk.install'
+	cd $srcdir/build/kcachegrind
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kcachegrind
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kdeaccounts-plugin() {
+        pkgdesc='KDE Repository Accounts'
+        depends=('kdepim-runtime')
+        cd $srcdir/build/kdeaccounts-plugin
+        make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kdepalettes() {
+	pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
+	optdepends=('gimp')
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
+		$pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
+}
+
+package_kdesdk-kioslave() {
+	pkgdesc='KDED Subversion Module'
+	depends=('kdebase-runtime' 'subversion')
+	cd $srcdir/build/kioslave
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kmtrace() {
+	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/kmtrace
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmtrace
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kompare() {
+	pkgdesc='Diff/Patch Frontend'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/development/kompare/"
+	install='kdesdk.install'
+	cd $srcdir/build/kompare
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kompare
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kpartloader() {
+	pkgdesc='A test application for KParts'
+	depends=('kdebase-runtime')
+	install='kdesdk.install'
+	cd $srcdir/build/kpartloader
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kprofilemethod() {
+	pkgdesc='Macros helping to profile'
+	cd $srcdir/build/kprofilemethod
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kspy() {
+	pkgdesc='An Object Inspector for Qt/KDE applications'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/kspy
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kstartperf() {
+	pkgdesc='Startup time measurement tool for KDE applications'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/kstartperf
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kuiviewer() {
+	pkgdesc='Qt Designer UI File Viewer'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/development/kuiviewer/"
+	install='kdesdk.install'
+	cd $srcdir/build/kuiviewer
+	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-lokalize() {
+	pkgdesc='Computer-Aided Translation System'
+	depends=('kdebase-runtime' 'kdebindings-python')
+	url="http://kde.org/applications/development/lokalize/"
+	optdepends=('translate-toolkit: enable extra python script')
+	install='kdesdk.install'
+	cd $srcdir/build/lokalize
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/lokalize
+	make DESTDIR=$pkgdir install
+}
+
+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
+}
+
+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.install'
+	cd $srcdir/build/umbrello
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/umbrello
+	make DESTDIR=$pkgdir install
+}
diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
new file mode 100644
index 000000000..c2c0745d1
--- /dev/null
+++ b/staging/kdesdk/fix-python2-path.patch
@@ -0,0 +1,64 @@
+--- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~	2010-11-24 11:53:38.586666671 +0100
++++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree	2010-11-24 11:53:38.623333337 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # _*_ coding: latin1 _*_
+ 
+ #
+--- 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/rename_source_files~	2010-11-24 11:45:41.040000004 +0100
++++ kdesdk-4.5.80/scripts/rename_source_files	2010-11-24 11:45:41.093333336 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ #
+ # Copyright David Faure <faure@kde.org>, License LGPL v2
+ #
+--- 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
+--- kdesdk-4.5.80/scripts/kde_generate_export_header~	2010-11-24 11:48:49.696666669 +0100
++++ kdesdk-4.5.80/scripts/kde_generate_export_header	2010-11-24 11:48:49.753333338 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ 
+ import os, sys, string
+ 
+--- kdesdk-4.5.80/scripts/reviewboarddiff~	2010-11-24 11:49:37.686666670 +0100
++++ kdesdk-4.5.80/scripts/reviewboarddiff	2010-11-24 11:49:37.740000003 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # encoding: utf-8
+ #
+ # Generates reviewboard compatible diffs from git-svn repositories.
diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
new file mode 100644
index 000000000..3f06b8deb
--- /dev/null
+++ b/staging/kdesdk/kdesdk-okteta.install
@@ -0,0 +1,12 @@
+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.install b/staging/kdesdk/kdesdk.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdesdk/kdesdk.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..2a8df4c25
--- /dev/null
+++ b/staging/kdetoys/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 141565 2011-10-31 04:24:01Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdetoys
+pkgname=('kdetoys-amor'
+         'kdetoys-kteatime'
+         'kdetoys-ktux')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdetoys')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('93d6f0a92c805de51fc68469f940f38858f81fbe')
+
+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
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdetoys/kdetoys.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
new file mode 100644
index 000000000..15ae7e1c8
--- /dev/null
+++ b/staging/kdeutils/PKGBUILD
@@ -0,0 +1,191 @@
+# $Id: PKGBUILD 141580 2011-10-31 11:35:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdeutils
+pkgname=('kdeutils-ark'
+         'kdeutils-filelight'
+         'kdeutils-kcalc'
+         'kdeutils-kcharselect'
+         'kdeutils-kdf'
+         'kdeutils-kfloppy'
+         'kdeutils-kgpg'
+         'kdeutils-kremotecontrol'
+         'kdeutils-ktimer'
+         'kdeutils-kwallet'
+         'kdeutils-printer-applet'
+         'kdeutils-superkaramba'
+         'kdeutils-sweeper')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeutils')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
+	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
+	'qjson')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('23fc9823647152d5d8cc250a55402c8930db4059')
+
+build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    
+    # Use Python2
+    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+      kcharselect/kcharselect-generate-datafile.py \
+      superkaramba/examples/richtext/rtext.py
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+
+	cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
+	make
+}
+
+package_kdeutils-ark() {
+	pkgdesc='Archiving Tool'
+	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
+	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
+	url="http://kde.org/applications/utilities/ark/"
+	cd $srcdir/build/ark
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/ark/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-filelight() {
+	pkgdesc='View disk usage information'
+	depends=('kdebase-runtime' 'qimageblitz')
+	replaces=('filelight')
+	conflicts=('filelight')
+	install='kdeutils.install'
+	url="http://methylblue.com/filelight/"
+	cd $srcdir/build/filelight
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/filelight/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kcalc() {
+	pkgdesc='Scientific Calculator'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kcalc/"
+	cd $srcdir/build/kcalc
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kcalc/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kcharselect() {
+	pkgdesc='Character Selector'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kcharselect/"
+	cd $srcdir/build/kcharselect
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kcharselect/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kdf() {
+	pkgdesc='View Disk Usage'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/system/kdiskfree/"
+	install='kdeutils.install'
+	cd $srcdir/build/kdf
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kdf/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kfloppy() {
+	pkgdesc='Floppy Formatter'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/kfloppy/"
+	install='kdeutils.install'
+	cd $srcdir/build/kfloppy
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kfloppy/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kgpg() {
+	pkgdesc='A GnuPG frontend'
+	depends=('kdepim-runtime' 'kde-agent')
+	url="http://kde.org/applications/utilities/kgpg"
+	install='kdeutils.install'
+	cd $srcdir/build/kgpg
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kgpg/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kremotecontrol() {
+	pkgdesc='Configure your remote controls for use with applications'
+	replaces=('kdeutils-kdelirc')
+	conflicts=('kdeutils-kdelirc')
+	depends=('kdebase-workspace')
+	url="http://kde.org/applications/utilities/kremotecontrol"
+	install='kdeutils.install'
+	cd $srcdir/build/kremotecontrol
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kremotecontrol/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-ktimer() {
+	pkgdesc='Countdown Launcher'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/ktimer"
+	install='kdeutils.install'
+	cd $srcdir/build/ktimer
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/ktimer/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-kwallet() {
+	pkgdesc='Wallet Management Tool'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/system/kwalletmanager/"
+	install='kdeutils.install'
+	cd $srcdir/build/kwallet
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/kwallet/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-printer-applet() {
+	pkgdesc='System tray icon for managing print jobs'
+	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
+	url="http://kde.org/applications/system/printerapplet/"
+	cd $srcdir/build/printer-applet
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/printer-applet/doc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-superkaramba() {
+	pkgdesc='An engine for cool desktop eyecandy'
+	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
+	url="http://kde.org/applications/utilities/superkaramba"
+	install='kdeutils.install'
+	cd $srcdir/build/superkaramba
+	make DESTDIR=$pkgdir install
+}
+
+package_kdeutils-sweeper() {
+	pkgdesc='System Cleaner'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/utilities/sweeper/"
+	cd $srcdir/build/sweeper
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/sweeper/doc
+	make DESTDIR=$pkgdir install
+}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdeutils/kdeutils.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
new file mode 100644
index 000000000..56c74272d
--- /dev/null
+++ b/staging/kdewebdev/PKGBUILD
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 141566 2011-10-31 04:24:49Z andrea $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdewebdev
+pkgname=('kdewebdev-kfilereplace'
+         'kdewebdev-kimagemapeditor'
+         'kdewebdev-klinkstatus'
+         'kdewebdev-kommander')
+pkgver=4.7.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdewebdev')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
+	'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('11108698887d376d00f02cbdfa1496aa3cb268c1')
+
+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')
+	install='kdewebdev.install'
+	cd $srcdir/build/kimagemapeditor
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kimagemapeditor
+	make DESTDIR=$pkgdir install
+}
+
+package_kdewebdev-klinkstatus() {
+	pkgdesc='Link Checker'
+	depends=('kdepim-runtime' 'tidyhtml')
+	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')
+	cd $srcdir/build/kommander
+	make DESTDIR=$pkgdir install
+}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kdewebdev/kdewebdev.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
new file mode 100644
index 000000000..d77ba4de4
--- /dev/null
+++ b/staging/libkipi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 141576 2011-10-31 08:07:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkipi
+pkgver=4.7.3
+pkgrel=1
+pkgdesc="An interface to use kipi-plugins from a KDE application"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('9c6d4406a1292cfe81fa27508ffe4d96633417bf')
+
+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
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/libkipi/libkipi.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/mediastreamer/PKGBUILD b/staging/mediastreamer/PKGBUILD
new file mode 100644
index 000000000..a82d87db1
--- /dev/null
+++ b/staging/mediastreamer/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 141596 2011-10-31 15:32:28Z andrea $
+# 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.7.3
+pkgrel=4
+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' 'v4l-utils' 'ffmpeg')
+makedepends=('cmake' 'automoc4')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "disable-v4l1.patch")
+md5sums=('5213307f557d86aa648f1a53a885138c'
+         '7ee15689eed1adbdcf0ddab8fadca34a')
+options=('!libtool')
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver/
+  patch -p2 -i "${srcdir}"/disable-v4l1.patch
+
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/lib/mediastreamer/
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/mediastreamer/disable-v4l1.patch b/staging/mediastreamer/disable-v4l1.patch
new file mode 100644
index 000000000..9f6cb84d4
--- /dev/null
+++ b/staging/mediastreamer/disable-v4l1.patch
@@ -0,0 +1,50 @@
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
+--- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
+@@ -117,7 +117,7 @@
+ endif
+ 
+ if BUILD_V4L
+-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
++libmediastreamer_la_SOURCES+=msv4l2.c
+ endif
+ 
+ if BUILD_WIN32
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
+--- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
+@@ -54,7 +54,7 @@
+ @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
+ @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
+ @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
+@@ -135,7 +135,7 @@
+ 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
+ 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
+ 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
+-	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
++	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
+ 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
+ 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
+ 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
+@@ -156,7 +156,7 @@
+ @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
+ @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
+@@ -600,7 +600,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
new file mode 100644
index 000000000..b5cd37fe6
--- /dev/null
+++ b/staging/moc/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 141629 2011-11-01 00:22:20Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=moc
+pkgver=20110528
+pkgrel=4
+pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
+arch=('i686' 'x86_64')
+url="http://moc.daper.net/"
+license=('GPL')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
+makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
+optdepends=('speex: for using the speex plugin' 
+	    'ffmpeg: for using the ffmpeg plugin'
+	    'taglib: for using the musepack plugin' 
+	    'libmpcdec: for using the musepack plugin' 
+            'wavpack: for using the wavpack plugin' 
+	    'libmodplug: for using the modplug plugin')
+options=('!libtool')
+source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
+        gcc-undefined-symbols.diff moc-ffmpeg.patch)
+sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p0 -i ../moc-ffmpeg.patch
+
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./autogen.sh
+  ./configure --prefix=/usr --without-rcc --without-aac \
+    --with-oss  --with-alsa  --with-jack --with-mp3 \
+    --with-musepack --with-vorbis --with-flac --with-wavpack \
+    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+    --with-samplerate --with-curl --disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff
new file mode 100644
index 000000000..09e9b8bda
--- /dev/null
+++ b/staging/moc/gcc-undefined-symbols.diff
@@ -0,0 +1,12 @@
+--- decoder.c~	2011-05-08 09:28:28.077137883 +0200
++++ decoder.c	2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ 	for (i = 0; i < plugins_num; i++)
+ 		if (plugins[i].decoder->destroy)
+ 			plugins[i].decoder->destroy ();
++	for (i = 0; i < plugins_num; i++)
++		if (plugins[i].handle)
++                    lt_dlclose(plugins[i].handle);
+ 
+ 	if (lt_dlexit())
+ 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..7554ea14e
--- /dev/null
+++ b/staging/moc/moc-ffmpeg.patch
@@ -0,0 +1,26 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
++++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
+@@ -28,12 +28,6 @@
+ #include <ffmpeg/avformat.h>
+ #endif
+ 
+-/* libavformat's API will be changing at version 53, but at present there
+- * appears to be no guidance on what will replace the deprecated fields. */
+-#ifndef FF_API_OLD_METADATA
+-#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
+-#endif
+-
+ /* FFmpeg also likes common names, without that, our common.h and log.h
+  * would not be included. */
+ #undef COMMON_H
+@@ -137,7 +131,7 @@
+ 	av_read_play (data->ic);
+ 	for (i = 0; i < data->ic->nb_streams; i++) {
+ 		data->enc = data->ic->streams[i]->codec;
+-		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
++		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 			audio_index = i;
+ 			break;
+ 		}
diff --git a/staging/mpd/ChangeLog b/staging/mpd/ChangeLog
new file mode 100644
index 000000000..40ba5e4e7
--- /dev/null
+++ b/staging/mpd/ChangeLog
@@ -0,0 +1,9 @@
+2011-09-03 Angel Velasquez <angvp@archlinux.org>
+    * Version bump to 0.16.4
+    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
+
+2011-06-25 Angel Velasquez <angvp@archlinux.org>
+    * Added a patch for bug with ffmpeg FS#24839 
+
+
+# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/staging/mpd/PKGBUILD b/staging/mpd/PKGBUILD
new file mode 100644
index 000000000..4a09ec315
--- /dev/null
+++ b/staging/mpd/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 141592 2011-10-31 14:59:27Z bluewind $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Ben <ben@benmazer.net>
+
+pkgname=mpd
+pkgver=0.16.5
+pkgrel=2
+pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://mpd.wikia.com/wiki/Server"
+depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
+         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
+         'libpulse')
+makedepends=('pkgconfig' 'doxygen')
+install=${pkgname}.install
+changelog=ChangeLog
+source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
+'mpd') 
+md5sums=('f7564cff12035f6a1112cce770655df7'
+         'e5669c2bff4031928531e52475addeb1')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-lastfm \
+    --enable-jack \
+    --enable-pulse \
+    --enable-documentation \
+    --disable-libwrap \
+    --disable-cue \
+    --disable-sidplay \
+    --with-systemdsystemunitdir=/lib/systemd/system
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # set our dirs in mpd.conf file
+  sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
+  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
+  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
+  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
+  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
+  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
+  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
+  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
+
+  install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example"
+
+  install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd"
+  install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd}
+}
diff --git a/staging/mpd/mpd b/staging/mpd/mpd
new file mode 100755
index 000000000..6134e2ed4
--- /dev/null
+++ b/staging/mpd/mpd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting Music Player Daemon"
+    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
+    /usr/bin/mpd /etc/mpd.conf &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mpd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Music Player Daemon"
+    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mpd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/staging/mpd/mpd.install b/staging/mpd/mpd.install
new file mode 100644
index 000000000..885505a07
--- /dev/null
+++ b/staging/mpd/mpd.install
@@ -0,0 +1,18 @@
+post_install() {
+  post_upgrade
+  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
+}
+
+post_upgrade() {
+  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
+  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
+  for dir in /var/{lib,log}/mpd; do
+    chown -R mpd:mpd "$dir" 1>/dev/null
+  done
+}
+
+post_remove() {
+  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
+  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
+  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
+}
diff --git a/staging/opal/PKGBUILD b/staging/opal/PKGBUILD
new file mode 100644
index 000000000..6490f3deb
--- /dev/null
+++ b/staging/opal/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 141594 2011-10-31 15:04:50Z ibiru $
+# Maintainer: Jan de Groot <jan@archlinux.org>
+# Contributor: Tom K <tomk@runbox.com>
+pkgname=opal
+pkgver=3.10.2
+pkgrel=3
+pkgdesc="Open Phone Abstraction Library"
+arch=(i686 x86_64)
+url="http://www.ekiga.org"
+license=('GPL')
+depends=('ptlib' 'libtheora' 'x264' 'speex')
+makedepends=('ffmpeg')
+options=(!makeflags)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
+
+build() {
+  cd "${srcdir}/opal-${pkgver}"
+  CXXFLAGS="$CXXFLAGS -fpermissive" \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/opal-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD
new file mode 100644
index 000000000..1ed22a3f1
--- /dev/null
+++ b/staging/sox/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 141635 2011-11-01 02:16:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=sox
+pkgver=14.3.2
+pkgrel=4
+pkgdesc="The Swiss Army knife of sound processing tools"
+arch=('i686' 'x86_64')
+url="http://sox.sourceforge.net/"
+license=('GPL' 'LGPL')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
+optdepends=('libao: for ao plugin'
+            'ffmpeg: for ffmpeg plugin'
+            'libmad: for mp3 plugin'
+            'libid3tag: for mp3 plugin'
+            'wavpack: for wavpack plugin'
+            'libpulse: for pulse plugin')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        sox-14.3.2-ffmpeg.patch)
+sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
+          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
+  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-dyn-default --with-distro="Arch Linux"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch
new file mode 100644
index 000000000..5289b9b47
--- /dev/null
+++ b/staging/sox/sox-14.3.2-ffmpeg.patch
@@ -0,0 +1,40 @@
+Index: sox-14.3.2/src/ffmpeg.c
+===================================================================
+--- sox-14.3.2.orig/src/ffmpeg.c
++++ sox-14.3.2/src/ffmpeg.c
+@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+     return -1;
+-  if (enc->codec_type != CODEC_TYPE_AUDIO) {
++  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
+     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
+     return -1;
+   }
+@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
+   /* Find audio stream (FIXME: allow different stream to be selected) */
+   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
+     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
+-    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
++    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+       ffmpeg->audio_index = i;
+       break;
+     }
+@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
+ 
+   c = st->codec;
+   c->codec_id = codec_id;
+-  c->codec_type = CODEC_TYPE_AUDIO;
++  c->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+   /* put sample parameters */
+   c->bit_rate = 256000;  /* FIXME: allow specification */
+@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
+       av_init_packet(&pkt);
+       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
+       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       pkt.stream_index = ffmpeg->audio_st->index;
+       pkt.data = ffmpeg->audio_buf_aligned;
+ 
diff --git a/staging/x264/PKGBUILD b/staging/x264/PKGBUILD
new file mode 100644
index 000000000..542a23528
--- /dev/null
+++ b/staging/x264/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 141584 2011-10-31 13:05:32Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=x264
+pkgver=20111030
+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.tar.bz2)
+md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
+
+build() {
+    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
+
+    ./configure --enable-shared
+
+    make
+    make DESTDIR="$pkgdir" \
+      bindir=/usr/bin \
+      libdir=/usr/lib \
+      includedir=/usr/include \
+      install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
new file mode 100644
index 000000000..325dc8456
--- /dev/null
+++ b/staging/xine-lib/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 141637 2011-11-01 02:51:18Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=xine-lib
+pkgver=1.1.19
+pkgrel=6
+pkgdesc="A multimedia playback engine"
+arch=('i686' 'x86_64')
+url="http://www.xine-project.org"
+license=('LGPL' 'GPL')
+depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
+             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+            'smbclient: for using the smb plugin' \
+            'jack: for using the jack plugin' \
+            'vcdimager: for using the vcd plugin' \
+            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
+            'mesa: for using the opengl plugin' \
+            'libpulse: for using the pulseaudio plugin' \
+            'speex: for using the speex plugin' \
+            'v4l-utils: for using the v4l 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')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
+        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch
+        xine-lib-1.1.19-ffmpeg.patch)
+sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d'
+          '121a8358d7919b2e51067412373f52848290338a'
+          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34'
+          'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch"
+  patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch"
+  patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch"
+  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
+    configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
+
+  libtoolize --force --copy
+  aclocal -I m4
+  autoconf
+  automake --add-missing
+
+  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
new file mode 100644
index 000000000..4b6ba9e35
--- /dev/null
+++ b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
@@ -0,0 +1,13 @@
+--- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
++++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
+@@ -161,10 +161,6 @@
+                   ;;
+ 
+               esac
+-              if test x"$archopt_val" != x; then
+-                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+-                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+-              fi
+             fi
+           else
+             dnl we have the Intel compiler
diff --git a/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch
new file mode 100644
index 000000000..6817aa989
--- /dev/null
+++ b/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch
@@ -0,0 +1,380 @@
+diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c
+--- a/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 19:46:49 2011 -0400
+@@ -46,6 +46,12 @@
+ 
+ #define AUDIOBUFSIZE (64 * 1024)
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#  define AVAUDIO 3
++#else
++#  define AVAUDIO 2
++#endif
++
+ typedef struct {
+   audio_decoder_class_t   decoder_class;
+ } ff_audio_class_t;
+@@ -255,6 +261,9 @@
+       buf->decoder_info[2]);
+ 
+   } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
++#if AVAUDIO > 2
++    AVPacket avpkt;
++#endif
+ 
+     if( !this->decoder_ok ) {
+       if ( ! this->context || ! this->codec ) {
+@@ -286,11 +295,21 @@
+     if (!this->output_open) {
+       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++#if AVAUDIO > 2
++	av_init_packet (&avpkt);
++	avpkt.data = (uint8_t *)&this->buf[0];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	avcodec_decode_audio3 (this->context,
++			       (int16_t *)this->decode_buffer,
++			       &decode_buffer_size, &avpkt);
++#else
+         avcodec_decode_audio2 (this->context,
+                               (int16_t *)this->decode_buffer,
+                               &decode_buffer_size,
+                               &this->buf[0],
+                               this->size);
++#endif
+ 	this->audio_bits = this->context->bits_per_sample;
+ 	this->audio_sample_rate = this->context->sample_rate;
+ 	this->audio_channels = this->context->channels;
+@@ -311,12 +330,21 @@
+       offset = 0;
+       while (this->size>0) {
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++#if AVAUDIO > 2
++	av_init_packet (&avpkt);
++	avpkt.data = (uint8_t *)&this->buf[offset];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	bytes_consumed = avcodec_decode_audio3 (this->context,
++						(int16_t *)this->decode_buffer,
++						&decode_buffer_size, &avpkt);
++#else
+         bytes_consumed = avcodec_decode_audio2 (this->context,
+                                                (int16_t *)this->decode_buffer,
+                                                &decode_buffer_size,
+                                                &this->buf[offset],
+                                                this->size);
+-
++#endif
+         if (bytes_consumed<0) {
+           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+                    "ffmpeg_audio_dec: error decompressing audio frame\n");
+diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c
+--- a/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 19:46:49 2011 -0400
+@@ -58,6 +58,14 @@
+ 
+ #define ENABLE_DIRECT_RENDERING
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#  define AVVIDEO 2
++#else
++#  define AVVIDEO 1
++#  define pp_context	pp_context_t
++#  define pp_mode	pp_mode_t
++#endif
++
+ /* reordered_opaque appeared in libavcodec 51.68.0 */
+ #define AVCODEC_HAS_REORDERED_OPAQUE
+ #if LIBAVCODEC_VERSION_INT < 0x334400
+@@ -116,8 +124,8 @@
+ 
+   int               pp_quality;
+   int               pp_flags;
+-  pp_context_t     *pp_context;
+-  pp_mode_t        *pp_mode;
++  pp_context       *our_context;
++  pp_mode          *our_mode;
+ 
+   /* mpeg-es parsing */
+   mpeg_parser_t    *mpeg_parser;
+@@ -444,23 +452,23 @@
+   this->pp_quality = this->class->pp_quality;
+ 
+   if(this->pp_available && this->pp_quality) {
+-    if(!this->pp_context && this->context)
+-      this->pp_context = pp_get_context(this->context->width, this->context->height,
++    if(!this->our_context && this->context)
++      this->our_context = pp_get_context(this->context->width, this->context->height,
+                                         this->pp_flags);
+-    if(this->pp_mode)
+-      pp_free_mode(this->pp_mode);
++    if(this->our_mode)
++      pp_free_mode(this->our_mode);
+ 
+-    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
++    this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
+                                                     this->pp_quality);
+   } else {
+-    if(this->pp_mode) {
+-      pp_free_mode(this->pp_mode);
+-      this->pp_mode = NULL;
++    if(this->our_mode) {
++      pp_free_mode(this->our_mode);
++      this->our_mode = NULL;
+     }
+ 
+-    if(this->pp_context) {
+-      pp_free_context(this->pp_context);
+-      this->pp_context = NULL;
++    if(this->our_context) {
++      pp_free_context(this->our_context);
++      this->our_context = NULL;
+     }
+   }
+ }
+@@ -1055,12 +1063,26 @@
+     }
+ 
+     /* skip decoding b frames if too late */
++#if AVVIDEO > 1
++    this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
++#else
+     this->context->hurry_up = (this->skipframes > 0);
++#endif
+ 
+     lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
++#if AVVIDEO > 1
++    AVPacket avpkt;
++    av_init_packet(&avpkt);
++    avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
++    avpkt.size = this->mpeg_parser->buffer_size;
++    avpkt.flags = AV_PKT_FLAG_KEY;
++    len = avcodec_decode_video2 (this->context, this->av_frame,
++				 &got_picture, &avpkt);
++#else
+     len = avcodec_decode_video (this->context, this->av_frame,
+                                 &got_picture, this->mpeg_parser->chunk_buffer,
+                                 this->mpeg_parser->buffer_size);
++#endif
+     lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
+             len, got_picture);
+     len = current - buf->content - offset;
+@@ -1112,7 +1134,13 @@
+ 
+     } else {
+ 
+-      if (this->context->hurry_up) {
++      if (
++#if AVVIDEO > 1
++	  this->context->skip_frame != AVDISCARD_DEFAULT
++#else
++	  this->context->hurry_up
++#endif
++	 ) {
+         /* skipped frame, output a bad frame */
+         img = this->stream->video_out->get_frame (this->stream->video_out,
+                                                   this->bih.biWidth,
+@@ -1304,13 +1332,25 @@
+         got_picture = 0;
+       } else {
+         /* skip decoding b frames if too late */
++#if AVVIDEO > 1
++	this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
++#else
+         this->context->hurry_up = (this->skipframes > 0);
+-
++#endif
+         lprintf("buffer size: %d\n", this->size);
++#if AVVIDEO > 1
++	AVPacket avpkt;
++	av_init_packet(&avpkt);
++	avpkt.data = (uint8_t *)&chunk_buf[offset];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	len = avcodec_decode_video2 (this->context, this->av_frame,
++				     &got_picture, &avpkt);
++#else
+         len = avcodec_decode_video (this->context, this->av_frame,
+                                     &got_picture, &chunk_buf[offset],
+                                     this->size);
+-
++#endif
+ #ifdef AVCODEC_HAS_REORDERED_OPAQUE
+         /* reset consumed pts value */
+         this->context->reordered_opaque = ff_tag_pts(this, 0);
+@@ -1432,7 +1472,7 @@
+                         img->base, img->pitches,
+                         img->width, img->height,
+                         this->av_frame->qscale_table, this->av_frame->qstride,
+-                        this->pp_mode, this->pp_context,
++                        this->our_mode, this->our_context,
+                         this->av_frame->pict_type);
+ 
+         } else if (!this->av_frame->opaque) {
+@@ -1676,11 +1716,11 @@
+     free(this->buf);
+   this->buf = NULL;
+ 
+-  if(this->pp_context)
+-    pp_free_context(this->pp_context);
++  if(this->our_context)
++    pp_free_context(this->our_context);
+ 
+-  if(this->pp_mode)
+-    pp_free_mode(this->pp_mode);
++  if(this->our_mode)
++    pp_free_mode(this->our_mode);
+ 
+   mpeg_parser_dispose(this->mpeg_parser);
+ 
+@@ -1721,8 +1761,8 @@
+   this->aspect_ratio      = 0;
+ 
+   this->pp_quality        = 0;
+-  this->pp_context        = NULL;
+-  this->pp_mode           = NULL;
++  this->our_context       = NULL;
++  this->our_mode          = NULL;
+ 
+   this->mpeg_parser       = NULL;
+ 
+diff -r 717450d734f7 src/post/planar/pp.c
+--- a/src/post/planar/pp.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/post/planar/pp.c	Mon May 16 19:46:49 2011 -0400
+@@ -35,6 +35,12 @@
+ #  include <libpostproc/postprocess.h>
+ #endif
+ 
++#if LIBPOSTPROC_VERSION_MAJOR < 52
++#  define pp_context	pp_context_t
++#  define pp_mode	pp_mode_t
++#  define PP_PARAMETERS_T
++#endif
++
+ #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
+ 
+ /* plugin class initialization function */
+@@ -76,14 +82,15 @@
+ 
+   /* libpostproc specific stuff */
+   int                pp_flags;
+-  pp_context_t      *pp_context;
+-  pp_mode_t         *pp_mode;
++  pp_context        *our_context;
++  pp_mode           *our_mode;
+ 
+   pthread_mutex_t    lock;
+ };
+ 
+ 
+ static int set_parameters (xine_post_t *this_gen, void *param_gen) {
++#ifdef PP_PARAMETERS_T
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+   pp_parameters_t *param = (pp_parameters_t *)param_gen;
+ 
+@@ -92,17 +99,18 @@
+   memcpy( &this->params, param, sizeof(pp_parameters_t) );
+ 
+   pthread_mutex_unlock (&this->lock);
+-
++#endif
+   return 1;
+ }
+ 
+ static int get_parameters (xine_post_t *this_gen, void *param_gen) {
++#ifdef PP_PARAMETERS_T
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+   pp_parameters_t *param = (pp_parameters_t *)param_gen;
+ 
+ 
+   memcpy( param, &this->params, sizeof(pp_parameters_t) );
+-
++#endif
+   return 1;
+ }
+ 
+@@ -202,8 +210,8 @@
+   if(cpu_caps & MM_ACCEL_X86_3DNOW)
+     this->pp_flags |= PP_CPU_CAPS_3DNOW;
+ 
+-  this->pp_mode = NULL;
+-  this->pp_context = NULL;
++  this->our_mode = NULL;
++  this->our_context = NULL;
+ 
+   pthread_mutex_init (&this->lock, NULL);
+ 
+@@ -248,13 +256,13 @@
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+ 
+   if (_x_post_dispose(this_gen)) {
+-    if(this->pp_mode) {
+-      pp_free_mode(this->pp_mode);
+-      this->pp_mode = NULL;
++    if(this->our_mode) {
++      pp_free_mode(this->our_mode);
++      this->our_mode = NULL;
+     }
+-    if(this->pp_context) {
+-      pp_free_context(this->pp_context);
+-      this->pp_context = NULL;
++    if(this->our_context) {
++      pp_free_context(this->our_context);
++      this->our_context = NULL;
+     }
+     free(this);
+   }
+@@ -304,7 +312,7 @@
+ 
+     pthread_mutex_lock (&this->lock);
+ 
+-    if( !this->pp_context ||
++    if( !this->our_context ||
+         this->frame_width != yv12_frame->width ||
+         this->frame_height != yv12_frame->height ) {
+ 
+@@ -312,32 +320,32 @@
+       this->frame_height = yv12_frame->height;
+       pp_flags = this->pp_flags;
+ 
+-      if(this->pp_context)
+-        pp_free_context(this->pp_context);
++      if(this->our_context)
++        pp_free_context(this->our_context);
+ 
+-      this->pp_context = pp_get_context(frame->width, frame->height, pp_flags);
++      this->our_context = pp_get_context(frame->width, frame->height, pp_flags);
+ 
+-      if(this->pp_mode) {
+-        pp_free_mode(this->pp_mode);
+-        this->pp_mode = NULL;
++      if(this->our_mode) {
++        pp_free_mode(this->our_mode);
++        this->our_mode = NULL;
+       }
+     }
+ 
+-    if(!this->pp_mode)
+-      this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode,
++    if(!this->our_mode)
++      this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode,
+                                                       this->params.quality);
+ 
+-    if(this->pp_mode)
++    if(this->our_mode)
+       pp_postprocess(yv12_frame->base, yv12_frame->pitches,
+                      out_frame->base, out_frame->pitches,
+                      (frame->width+7)&(~7), frame->height,
+                      NULL, 0,
+-                     this->pp_mode, this->pp_context,
++                     this->our_mode, this->our_context,
+                      0 /*this->av_frame->pict_type*/);
+ 
+     pthread_mutex_unlock (&this->lock);
+ 
+-    if(this->pp_mode) {
++    if(this->our_mode) {
+       skip = out_frame->draw(out_frame, stream);
+       _x_post_frame_copy_up(frame, out_frame);
+     } else {
diff --git a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
new file mode 100644
index 000000000..bef8b0bac
--- /dev/null
+++ b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
@@ -0,0 +1,17 @@
+Quoting ChangeLog of X11's videoproto package:
+vldXvMC.h: stop uselessly including XvMClib.h
+
+--- src/video_out/xxmc.h
++++ src/video_out/xxmc.h
+@@ -77,10 +77,10 @@
+ #include <X11/extensions/XShm.h>
+ #include <X11/extensions/Xv.h>
+ #include <X11/extensions/Xvlib.h>
++#include <X11/extensions/XvMClib.h>
+ #ifdef HAVE_VLDXVMC
+   #include <X11/extensions/vldXvMC.h>
+ #else
+-  #include <X11/extensions/XvMClib.h>
+   #include <X11/extensions/XvMC.h>
+ #endif
+ 
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
new file mode 100644
index 000000000..f488dc463
--- /dev/null
+++ b/testing/ruby/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 141569 2011-10-31 04:52:32Z eric $
+# Maintainer:
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Jeramy Rutley <jrutley@gmail.com>
+
+pkgbase=ruby
+pkgname=('ruby' 'ruby-docs')
+pkgver=1.9.3_p0
+pkgrel=1
+pkgdesc="An object-oriented language for quick and easy programming"
+arch=('i686' 'x86_64')
+url="http://www.ruby-lang.org/en/"
+license=('BSD' 'custom')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
+sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
+      --enable-shared --enable-pthread --disable-rpath
+  make
+}
+
+package_ruby() {
+  depends=('openssl' 'libffi' 'libyaml')
+  provides=('rubygems' 'rake')
+  conflicts=('rake')
+  optdepends=('tk: for Ruby/TK')
+
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  make DESTDIR="${pkgdir}" install-nodoc
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+}
+
+package_ruby-docs() {
+  pkgdesc="Documentation files for ruby"
+
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  make DESTDIR="${pkgdir}" install-doc install-capi
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+}
diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch
new file mode 100644
index 000000000..e88f9d907
--- /dev/null
+++ b/testing/tzdata/Makefile.patch
@@ -0,0 +1,140 @@
+diff -Naur src/Makefile src-p/Makefile
+--- src/Makefile	2007-08-20 16:47:41.000000000 +0200
++++ src-p/Makefile	2007-10-02 04:07:44.000000000 +0200
+@@ -34,17 +34,17 @@
+ 
+ # Everything gets put in subdirectories of. . .
+ 
+-TOPDIR=		/usr/local
++TOPDIR=		$(DESTDIR)/usr
+ 
+ # "Compiled" time zone information is placed in the "TZDIR" directory
+ # (and subdirectories).
+ # Use an absolute path name for TZDIR unless you're just testing the software.
+ 
+-TZDIR=		$(TOPDIR)/etc/zoneinfo
++TZDIR=		$(TOPDIR)/share/zoneinfo
+ 
+ # The "tzselect", "zic", and "zdump" commands get installed in. . .
+ 
+-ETCDIR=		$(TOPDIR)/etc
++SBINDIR=		$(TOPDIR)/sbin
+ 
+ # If you "make INSTALL", the "date" command gets installed in. . .
+ 
+@@ -52,7 +52,7 @@
+ 
+ # Manual pages go in subdirectories of. . .
+ 
+-MANDIR=		$(TOPDIR)/man
++MANDIR=		$(TOPDIR)/share/man
+ 
+ # Library functions are put in an archive in LIBDIR.
+ 
+@@ -83,7 +83,7 @@
+ 
+ # Non-default libraries needed to link.
+ # Add -lintl if you want to use `gettext' on Solaris.
+-LDLIBS=
++LDLIBS=$(LDFLAGS)
+ 
+ # Add the following to the end of the "CFLAGS=" line as needed.
+ #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
+@@ -211,7 +211,7 @@
+ # before the first Monday in January when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS=
++CFLAGS += -std=gnu99
+ 
+ # If you want zic's -s option used when installing, uncomment the next line
+ # ZFLAGS=	-s
+@@ -220,7 +220,7 @@
+ ZIC=		$(zic) $(ZFLAGS)
+ 
+ # The name of a Posix-compliant `awk' on your system.
+-AWK=		nawk
++AWK=		awk
+ 
+ # The path where SGML DTDs are kept.
+ SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
+@@ -241,8 +241,10 @@
+ 
+ ###############################################################################
+ 
+-cc=		cc
+-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++CC+=		-DTZDIR=\"$(TZDIR)\"
++ifeq ($(NLS),1)
++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++endif
+ 
+ TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
+ TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
+@@ -282,14 +284,16 @@
+ 
+ ALL:		all date
+ 
+-install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
++install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+ 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
+ 		cp iso3166.tab zone.tab $(TZDIR)/.
+-		-mkdir $(TOPDIR) $(ETCDIR)
+-		cp tzselect zic zdump $(ETCDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) \
++		-mkdir -p $(TOPDIR) $(SBINDIR)
++		cp zic zdump $(SBINDIR)/.
++		-mkdir -p $(TOPDIR) $(BINDIR)
++		cp tzselect $(BINDIR)/.
++		-mkdir -p $(TOPDIR) $(MANDIR) \
+ 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
+ 		-rm -f $(MANDIR)/man3/newctime.3 \
+ 			$(MANDIR)/man3/newtzset.3 \
+@@ -298,13 +302,11 @@
+ 			$(MANDIR)/man8/zdump.8 \
+ 			$(MANDIR)/man8/zic.8
+ 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
+-		cp tzfile.5 $(MANDIR)/man5/.
+-		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+ 
+ INSTALL:	ALL install date.1
+-		-mkdir $(TOPDIR) $(BINDIR)
++		-mkdir -p $(TOPDIR) $(BINDIR)
+ 		cp date $(BINDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
++		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
+ 		-rm -f $(MANDIR)/man1/date.1
+ 		cp date.1 $(MANDIR)/man1/.
+ 
+@@ -334,9 +336,9 @@
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+ other_two:	zic leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
++		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+-			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
++			-d $(TZDIR)/right -L leapseconds $(TDATA)
+ 
+ posix_right:	posix_only other_two
+ 
+@@ -367,7 +369,7 @@
+ 			<$? >$@
+ 		chmod +x $@
+ 
+-check:		check_tables check_web
++check:		check_tables
+ 
+ check_tables:	checktab.awk $(PRIMARY_YDATA)
+ 		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
+diff -Naur src/tzselect.ksh src-p/tzselect.ksh
+--- src/tzselect.ksh	2007-08-20 16:47:42.000000000 +0200
++++ src-p/tzselect.ksh	2007-10-02 04:07:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /bin/ksh
++#! /bin/bash
+ 
+ # '@(#)tzselect.ksh	8.1'
+ 
diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD
new file mode 100644
index 000000000..8829a03ef
--- /dev/null
+++ b/testing/tzdata/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 141575 2011-10-31 07:41:26Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=tzdata
+pkgver=2011n
+pkgrel=1
+_tzcode=2011i
+_tzdata=2011n
+pkgdesc="Sources for time zone and daylight saving time data"
+arch=('i686' 'x86_64')
+url="http://www.twinsun.com/tz/tz-link.htm"
+license=('GPL')
+depends=()
+makedepends=()
+optdepends=('bash: required by tzselect')
+options=('!emptydirs')
+source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
+	ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
+        #ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
+        Makefile.patch)
+md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
+         '20dbfb28efa008ddbf6dd34601ea40fa'
+         'a64ed97d1fc03c66ee8612c0d9f40507')
+
+build() {
+  cd ${srcdir}
+
+  tar -xf tzcode${_tzcode}.tar.gz
+  tar -xf ${pkgname}${_tzdata}.tar.gz
+
+  patch -Np1 -i "${srcdir}/Makefile.patch"
+
+  make
+}
+
+check() {
+  cd ${srcdir}
+  make -k check # || /bin/true
+}
+
+package() {
+  cd ${srcdir}
+  make DESTDIR="${pkgdir}" install
+
+  rm "${pkgdir}/usr/share/zoneinfo/localtime"
+}
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-11-02 10:47:02 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-11-02 10:47:02 -0300
commit	40e1222c1402c0d2aded73b95802f8197d0691a6 (patch)
tree	e1bf1a01ae7443e4a9f460200dad9580565b27c7
parent	3e3dd870121c91097220248a601578b92d332f2b (diff)
parent	37a1064b8105764414f279ced442e6ba2f63bea1 (diff)