Tue Aug 16 14:12:40 UTC 2011

author: Parabola <dev@list.parabolagnulinux.org> 2011-08-16 14:12:41 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2011-08-16 14:12:41 +0000
commit: 3abfc1ebef5936241997dd882938581c91743ee9 (patch)
tree: 2115f0512eb82f91f0a536d20631bed8eb37f47a
parent: ea595018ba8ae00d7030ff296ec4f50e122d2ea9 (diff)
143 files changed, 0 insertions, 6573 deletions
diff --git a/community-staging/aria2/PKGBUILD b/community-staging/aria2/PKGBUILD
deleted file mode 100644
index 19a015c8a..000000000
--- a/community-staging/aria2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=aria2
-pkgver=1.12.1
-pkgrel=2
-pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
-arch=('i686' 'x86_64')
-url='http://aria2.sourceforge.net/'
-license=('GPL')
-depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
-source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2")
-md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7')
-
-build() {
-  cd aria2-${pkgver}
-
-  ./configure \
-    --prefix=/usr \
-    --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd aria2-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD
deleted file mode 100644
index 403ec002d..000000000
--- a/community-staging/ekg2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 53828 2011-08-08 16:55:24Z jelle $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=ekg2
-pkgver=0.3.1
-pkgrel=1
-pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
-arch=('i686' 'x86_64')
-url="http://ekg2.org/"
-license=('GPL')
-depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme')
-optdepends=( 'xosd: for xosd support'
-	         'sqlite3: sqlite support'
-			 'gtk2: gtk support')
-provides=('ekg2-unicode')
-source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz)
-md5sums=('652e492fcf72281a42c3e5960347516e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-  	--with-libgadu \
-  	--with-xosd \
-	--enable-unicode \
-	--enable-shared \
-	--without-gpg
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod
-  mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld
-  rm -rf $pkgdir/usr/libexec
-  chmod -R 755 $pkgdir/usr/lib/perl5
-}
-md5sums=('68fc05b432c34622df6561eaabef5a40')
diff --git a/community-staging/filezilla/PKGBUILD b/community-staging/filezilla/PKGBUILD
deleted file mode 100644
index 73cb4f030..000000000
--- a/community-staging/filezilla/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 53693 2011-08-07 21:01:03Z bluewind $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=filezilla
-pkgver=3.5.0
-pkgrel=2
-pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
-arch=('i686' 'x86_64')
-url="http://filezilla-project.org/"
-license=('GPL')
-depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
-install=filezilla.install
-source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
-md5sums=('25617d75167d07c0d3cfced69a4cf7cc')
-
-build() {
-  cd ${pkgname}-${pkgver}
-   ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --disable-manualupdatecheck \
-    --disable-autoupdatecheck \
-    --disable-static \
-    --with-tinyxml=builtin
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('6a83c3afe99c2679d5a3aa73607d80a7')
diff --git a/community-staging/filezilla/filezilla.install b/community-staging/filezilla/filezilla.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-staging/filezilla/filezilla.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/flightgear/PKGBUILD b/community-staging/flightgear/PKGBUILD
deleted file mode 100644
index 439e47c9c..000000000
--- a/community-staging/flightgear/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
-makedepends=('boost')
-license=("GPL")
-url="http://www.flightgear.org"
-options=('!makeflags')
-source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
-md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
-
-build() {
-  cd $srcdir/fg-flightgear
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
-  cd $srcdir/fg-flightgear
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/freerdp/PKGBUILD b/community-staging/freerdp/PKGBUILD
deleted file mode 100644
index 799008275..000000000
--- a/community-staging/freerdp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 53713 2011-08-07 21:41:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=0.8.2
-pkgrel=3
-pkgdesc="Free RDP client"
-arch=('i686' 'x86_64')
-url="http://freerdp.sourceforge.net"
-license=('GPL')
-depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib')
-makedepends=('krb5')
-conflicts=('freerdp-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cde590336292c977dfc1b4b7badf24d2')
-
-build() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  [ -x configure ] || sh ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/freerdp/freerdp.changelog b/community-staging/freerdp/freerdp.changelog
deleted file mode 100644
index d47f165c3..000000000
--- a/community-staging/freerdp/freerdp.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
diff --git a/community-staging/gloox/PKGBUILD b/community-staging/gloox/PKGBUILD
deleted file mode 100644
index bd6adf0e1..000000000
--- a/community-staging/gloox/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 53716 2011-08-07 21:42:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-
-pkgname=gloox
-pkgver=1.0
-pkgrel=2
-pkgdesc="C++ libraries for development of Jabber client/component/server"
-arch=(i686 x86_64)
-url="http://camaya.net/gloox"
-options=('!libtool')
-license=("GPL")
-depends=('libidn' 'gnutls')
-source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
-md5sums=('f8eacf1c6476e0a309b453fd04f90e31')
-
-build() {
-  cd $startdir/src/gloox-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/community-staging/gnustep-base/ChangeLog b/community-staging/gnustep-base/ChangeLog
deleted file mode 100644
index 590f23f5e..000000000
--- a/community-staging/gnustep-base/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2007-07-24 Snowman <eric@archlinux>
-	* rebuilt against toolchain in current
-	* fixed SMP build
-	* fixed file ownership
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community-staging/gnustep-base/PKGBUILD b/community-staging/gnustep-base/PKGBUILD
deleted file mode 100644
index d13e1f326..000000000
--- a/community-staging/gnustep-base/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 53739 2011-08-07 22:05:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-
-pkgname=gnustep-base
-pkgver=1.22.0
-pkgrel=3
-pkgdesc="The GNUstep base package"
-arch=('i686' 'x86_64')
-url="http://www.gnustep.org/"
-license=("GPL" "LGPL")
-depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls)
-makedepends=(gcc-objc)
-conflicts=('gnustep-base-svn')
-groups=('gnustep-core')
-options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('7faab4891ae6c1e7a6c806d6da368410')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  source /etc/profile.d/GNUstep.sh
-  ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/
-  # fix file ownership
-  sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble
-  make VERBOSE=1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  chown -R root.root "$pkgdir/"
-}
diff --git a/community-staging/gsasl/PKGBUILD b/community-staging/gsasl/PKGBUILD
deleted file mode 100644
index 735a57862..000000000
--- a/community-staging/gsasl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 53719 2011-08-07 21:42:52Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Orivej Desh <smpuj@bk.ru>
-# Maintainer: Orivej Desh <smpuj@bk.ru>
-
-pkgname=gsasl
-pkgver=1.6.1
-pkgrel=3
-pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
-arch=("i686" "x86_64")
-url="http://josefsson.org/gsasl/"
-license=("GPL")
-depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
-source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
-md5sums=('7ae813eeb1f90ad52e9a781ac9e17f28')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
-}
diff --git a/community-staging/gtk-gnutella/PKGBUILD b/community-staging/gtk-gnutella/PKGBUILD
deleted file mode 100644
index 1eb8c2b0f..000000000
--- a/community-staging/gtk-gnutella/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 53764 2011-08-08 05:26:47Z ebelanger $
-# Contributor: Dan McGee <dan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-gnutella
-pkgver=0.97
-pkgrel=2
-pkgdesc="A Gnutella client written in C"
-arch=('i686' 'x86_64')
-url="http://gtk-gnutella.sourceforge.net/"
-license=('GPL')
-depends=('gtk2')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d44e1af3441fb07a5e5712b0d522fae5')
-sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./build.sh --prefix=/usr --gtk2 --disable-dbus
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make install INSTALL_PREFIX="${pkgdir}"
-}
diff --git a/community-staging/gwenhywfar/PKGBUILD b/community-staging/gwenhywfar/PKGBUILD
deleted file mode 100644
index 1512a7eb1..000000000
--- a/community-staging/gwenhywfar/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 53745 2011-08-07 22:06:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-
-pkgname=gwenhywfar
-pkgver=4.2.0
-pkgrel=2
-pkgdesc="OS abstraction functions for various projects"
-arch=(i686 x86_64)
-url="http://www.aquamaniac.de"
-options=('!libtool')
-license=("LGPL")
-depends=('openssl' 'gnutls')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2' 'qt')
-source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
-md5sums=('62d15e090a0c21bc9d22489ceaaadfde')
-
-build() {
-  pacman -Q gwenhywfar && return 1
-  cd $srcdir/gwenhywfar-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/ifuse/PKGBUILD b/community-staging/ifuse/PKGBUILD
deleted file mode 100644
index e85372405..000000000
--- a/community-staging/ifuse/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=ifuse
-pkgver=1.1.1
-pkgrel=4
-pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
-url='http://libimobiledevice.org/'
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8d528a79de024b91f12f8ac67965c37c')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/jabberd14/PKGBUILD b/community-staging/jabberd14/PKGBUILD
deleted file mode 100644
index fccef817a..000000000
--- a/community-staging/jabberd14/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 53845 2011-08-08 21:03:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=jabberd14
-pkgver=1.6.1.1
-pkgrel=10
-pkgdesc="old (1.4) jabber server branch"
-arch=(i686 x86_64)
-url="http://jabberd.org/"
-license=("GPL")
-depends=(pth libidn expat popt gnutls)
-optdepends=(libmysqlclient)
-conflicts=(jabberd)
-backup=(etc/jabberd/jabber.xml)
-options=('!libtool')
-source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz
-	build-fix.patch
-	jabberd)
-md5sums=('597c7ee14518ba22b1cee883b4737d87'
-         'ad795626f26c01700a23515e0e75d654'
-         '5869169394d70977858320648075c7a6')
-
-build() {
-  cd $srcdir/jabberd14-$pkgver
-  export LDFLAGS="$LDFLAGS -lgcrypt"
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var
-  echo "#undef HAVE_GNUTLS_EXTRA" >>config.h
-  [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch
-  make -j1
-  make DESTDIR=$pkgdir install
-  install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/jabberd14/build-fix.patch b/community-staging/jabberd14/build-fix.patch
deleted file mode 100644
index 4f39b523e..000000000
--- a/community-staging/jabberd14/build-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2011-08-09 00:37:29.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2007-04-07 23:43:18.000000000 +0400
-@@ -910,8 +910,8 @@
-     }
- 
-     /* separate this step from the next one, and check for a predicate in this step */
--    start_predicate = strchr((char*)path, '[');
--    next_step = strchr((char*)path, '/');
-+    start_predicate = strchr(path, '[');
-+    next_step = strchr(path, '/');
-     if (start_predicate == NULL && next_step == NULL) {
- 	this_step = pstrdup(p, path);
-     } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) {
-@@ -1833,8 +1833,7 @@
-     if (lang != NULL && strchr(lang, '-') != NULL) {
- 	snprintf(general_lang, sizeof(general_lang), "%s", lang);
- 	if (strchr(lang, '-') != NULL) {
--	    char *tmp = strchr((char*)lang, '-');
--	    tmp[0] = 0;
-+	    strchr(lang, '-')[0] = 0;
- 	} else {
- 	    general_lang[0] = 0;
- 	}
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc	2011-08-09 00:37:29.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/log.cc	2007-07-20 17:56:59.000000000 +0400
-@@ -86,7 +86,7 @@
-     char *pos, c = '\0';
-     if(zone != NULL && debug__zones != NULL)
-     {
--	pos = strchr((char*)zone,'.');
-+	pos = strchr(zone,'.');
-         if(pos != NULL)
-         {
-             c = *pos;
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc	2011-08-09 00:53:55.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/mio_tls.cc	2007-07-17 03:20:44.000000000 +0400
-@@ -43,7 +43,6 @@
- #include <vector>
- #include <list>
- #include <iostream>
--#include <gnutls/openpgp.h>
- 
- // Tell gcrypt that we are using libpth - had to move this to a plain C file
- extern "C" void mio_tls_gcrypt_init(void);
-@@ -613,8 +612,7 @@
- 	    }
- 
- 	    // load OpenPGP key/certificate
--//	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
--	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
-+	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
- 	    if (ret < 0) {
- 		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
- 		continue;
-@@ -633,8 +631,7 @@
- 	    }
- 
- 	    // load the OpenPGP keyring
--//	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
--	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
-+	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
- 	    if (ret < 0) {
- 		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
- 		continue;
-@@ -643,8 +640,6 @@
- 	    continue;
- 	}
- 
--
--/*
- 	// load GnuPG trustdb
- 	if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
- 	    char const *const file = xmlnode_get_data(cur);
-@@ -661,7 +656,6 @@
- 		continue;
- 	    }
- 	}
--*/
- 
- 	// setup protocols to use
- 	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
diff --git a/community-staging/jabberd14/jabberd b/community-staging/jabberd14/jabberd
deleted file mode 100644
index afbe6ef69..000000000
--- a/community-staging/jabberd14/jabberd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/bin/jabberd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Jabber daemon"
-
-    [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd
-    [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        sleep 1 # wait on children
-        echo `get_pid` > /var/run/jabberd/jabberd.pid
-        add_daemon jabberd
-  	sleep 1
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Jabber daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    sleep 2
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/jabberd/jabberd.pid &> /dev/null
-      rm_daemon jabberd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/libinfinity/PKGBUILD b/community-staging/libinfinity/PKGBUILD
deleted file mode 100644
index 6f6e5f123..000000000
--- a/community-staging/libinfinity/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 53722 2011-08-07 21:43:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Gregory Haynes <greg@greghaynes.net>
-
-pkgname=libinfinity
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
-arch=('i686' 'x86_64')
-url="http://gobby.0x539.de"
-license=('GPL')
-depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
-makedepends=('gtk-doc' 'pkgconfig')
-optdepends=('avahi: zeroconf support'
-            'gtk2: gtk support')
-options=('!libtool')
-source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85e6d75e101fe25503653d2202054eff')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --localstatedir=/var
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  rm -rf $pkgdir/var
-}
diff --git a/community-staging/libmicrohttpd/PKGBUILD b/community-staging/libmicrohttpd/PKGBUILD
deleted file mode 100644
index 357863f07..000000000
--- a/community-staging/libmicrohttpd/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 53725 2011-08-07 21:44:17Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
-# Contributor: Kao Dome <kaodome@gmail.com>
-# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com>
-# Contributor: Mathias Rohnstock <linksoft@gmx.de>
-
-pkgname=libmicrohttpd
-pkgver=0.9.12
-pkgrel=2
-pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libmicrohttpd/"
-license=('LGPL')
-options=('!libtool')
-depends=('gnutls')
-install=libmicrohttpd.install
-source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('35b000cd7d201ace2b071d53a02b2c0d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \
-	--enable-curl --enable-messages --with-pic
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \
-	${pkgdir}/usr/include/$pkgname/platform.h
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
-	${pkgdir}/usr/include/$pkgname/plibc.h
-  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
-	$pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
-}
diff --git a/community-staging/libmicrohttpd/libmicrohttpd.install b/community-staging/libmicrohttpd/libmicrohttpd.install
deleted file mode 100644
index dc0d2b996..000000000
--- a/community-staging/libmicrohttpd/libmicrohttpd.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(microhttpd.info microhttpd-tutorial.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/community-staging/libvirt/PKGBUILD b/community-staging/libvirt/PKGBUILD
deleted file mode 100644
index 87c98529a..000000000
--- a/community-staging/libvirt/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 53748 2011-08-07 22:06:51Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jonathan Wiersma <archaur at jonw dot org>
-
-pkgname=libvirt
-pkgver=0.9.4
-pkgrel=2
-pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
-arch=('i686' 'x86_64')
-url="http://libvirt.org/"
-license=('LGPL')
-depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
-	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
-	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2')
-makedepends=('pkgconfig' 'lvm2')
-optdepends=('bridge-utils: for briged networking (default)'
-	    'dnsmasq: for NAT/DHCP for guests'
-	    'kernel26-ovz24: for openvz guests'
-	    'kvm'
-	    'lxc'
-	    'openbsd-netcat: for remote management over ssh'
-	    'qemu'
-	    'user-mode-linux'
-	    'virtualbox_bin'
-	    'virtualbox-ose'
-	    'xen'
-	    'radvd')
-options=('emptydirs' '!libtool')
-backup=('etc/conf.d/libvirtd'
-	'etc/libvirt/libvirtd.conf'
-	'etc/libvirt/qemu.conf'
-	'etc/sasl2/libvirt.conf')
-install="libvirt.install"
-source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
-	libvirtd.rc.d
-	libvirtd.conf.d
-	openbsd-netcat-default.patch
-	unixperms.patch
-	yajl-2.x.patch)
-md5sums=('86b411b11bd23d4af20611699f372af7'
-         'c43244c40a0437038c82089618e7beaa'
-         '3ed0e24f5b5e25bf553f5427d64915e6'
-         'ee7052f3929d5d918236c646a59edebf'
-         'db95aecdf2ccf3693fef5821cdcb7eba'
-         '5745bb8d0b254abb7a3528c66e03b0f9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  export PYTHON=`which python2`
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-#  for more information on authentication see http://libvirt.org/auth.html
-#  If you wish to have unix-permissions based access rather than only polkit
-#  access, create a group called libvirt and uncomment the line below:
-#  patch -Np1 -i "$srcdir"/unixperms.patch
-
-  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
-
-  # fixes for yajl 2.0 API changes
-#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch"
-
-  export LDFLAGS=-lX11
-  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
-	--with-storage-lvm --without-xen --with-udev --without-hal
-  find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \;
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
-  install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/libvirt/libvirt.install b/community-staging/libvirt/libvirt.install
deleted file mode 100644
index 3881386d2..000000000
--- a/community-staging/libvirt/libvirt.install
+++ /dev/null
@@ -1,38 +0,0 @@
-_libvirt_setup() {
-  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
-  echo ">>> To use libvirt as a non-root user:"
-  echo ">>>  Use polkit to grant access."
-  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
-  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
-  echo ""
-}
-
-post_install() {
-  _libvirt_setup || return 1
-  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
-  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
-  echo ""
-  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
-  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
-  echo ">>>  booting."
-  echo ""
-  /bin/true
-}
-
-post_upgrade() {
-  _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
-  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
-  echo ""
-  /bin/true
-}
-
-post_remove() {
-   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
-   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
-   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
-   echo ""
-   depmod -a
-   /bin/true
-}
diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-staging/libvirt/libvirtd.conf.d
deleted file mode 100644
index d4d25b47a..000000000
--- a/community-staging/libvirt/libvirtd.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
-LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
-KRB5_KTNAME="/etc/libvirt/krb5.tab"
diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-staging/libvirt/libvirtd.rc.d
deleted file mode 100755
index 193bffa9c..000000000
--- a/community-staging/libvirt/libvirtd.rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/libvirtd
-. /etc/rc.d/functions
-
-LIBVIRTD_CONFIG_ARGS=
-if [ -n "$LIBVIRTD_CONFIG" ]
-then
-	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-fi
-
-PID=`pidof -o %PPID /usr/sbin/libvirtd`
-case "$1" in
-    start)
-	stat_busy "Starting libvirtd"
-	export RADVD=/usr/sbin/radvd
-	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
-		[ -d $i ] || mkdir -p $i
-	done
-	[ -z "$PID" ] && (
-		mkdir -p /var/{cache,run}/libvirt
-		rm -rf /var/cache/libvirt/*
-		KRB5_KTNAME=$KRB5_KTNAME \
-			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon libvirtd
-		stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping libvirtd"
-	[ ! -z "$PID" ]  && (
-		kill $PID &> /dev/null
-		rm -rf /var/cache/libvirt/*
-		rm -f /var/run/libvirtd.pid
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon libvirtd
-		stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    reload)
-	stat_busy "Reloading libvirtd configuration"
-	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		stat_done
-	fi
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-staging/libvirt/openbsd-netcat-default.patch
deleted file mode 100644
index c7543c5a4..000000000
--- a/community-staging/libvirt/openbsd-netcat-default.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c
---- libvirt-0.9.4.org/src/qemu/qemu_migration.c	2011-08-03 05:36:34.000000000 +0400
-+++ libvirt-0.9.4/src/qemu/qemu_migration.c	2011-08-03 13:29:56.000000000 +0400
-@@ -1612,7 +1612,7 @@
-         ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
-                                                unixfile);
-     } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
--        const char *args[] = { "nc", "-U", unixfile, NULL };
-+        const char *args[] = { "nc.openbsd", "-U", unixfile, NULL };
-         ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
-     } else {
-         ret = -1;
-diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c
---- libvirt-0.9.4.org/src/remote/remote_driver.c	2011-07-29 09:14:03.000000000 +0400
-+++ libvirt-0.9.4/src/remote/remote_driver.c	2011-08-03 13:30:05.000000000 +0400
-@@ -588,7 +588,7 @@
-                                                 username,
-                                                 !tty,
-                                                 !verify,
--                                                netcat ? netcat : "nc",
-+                                                netcat ? netcat : "nc.openbsd",
-                                                 keyfile,
-                                                 sockname)))
-             goto failed;
-diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c
---- libvirt-0.9.4.org/src/rpc/virnetsocket.c	2011-08-01 05:32:35.000000000 +0400
-+++ libvirt-0.9.4/src/rpc/virnetsocket.c	2011-08-03 13:29:46.000000000 +0400
-@@ -629,7 +629,7 @@
-     if (noVerify)
-         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
-     virCommandAddArgList(cmd, nodename,
--                         netcat ? netcat : "nc",
-+                         netcat ? netcat : "nc.openbsd",
-                          "-U", path, NULL);
- 
-     return virNetSocketNewConnectCommand(cmd, retsock);
diff --git a/community-staging/libvirt/unixperms.patch b/community-staging/libvirt/unixperms.patch
deleted file mode 100644
index b3fb86cf5..000000000
--- a/community-staging/libvirt/unixperms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
---- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
-+++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
-@@ -78,14 +78,14 @@
- # without becoming root.
- #
- # This is restricted to 'root' by default.
--#unix_sock_group = "libvirt"
-+unix_sock_group = "libvirt"
- 
- # Set the UNIX socket permissions for the R/O socket. This is used
- # for monitoring VM status only
- #
- # Default allows any user. If setting group ownership may want to
- # restrict this to:
--#unix_sock_ro_perms = "0777"
-+unix_sock_ro_perms = "0770"
- 
- # Set the UNIX socket permissions for the R/W socket. This is used
- # for full management of VMs
-@@ -95,7 +95,7 @@
- #
- # If not using PolicyKit and setting group ownership for access
- # control then you may want to relax this to:
--#unix_sock_rw_perms = "0770"
-+unix_sock_rw_perms = "0770"
- 
- # Set the name of the directory in which sockets will be found/created.
- #unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +126,7 @@
- #
- # To restrict monitoring of domains you may wish to enable
- # an authentication mechanism here
--#auth_unix_ro = "none"
-+auth_unix_ro = "none"
- 
- # Set an authentication scheme for UNIX read-write sockets
- # By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +135,7 @@
- #
- # If the unix_sock_rw_perms are changed you may wish to enable
- # an authentication mechanism here
--#auth_unix_rw = "none"
-+auth_unix_rw = "none"
- 
- # Change the authentication scheme for TCP sockets.
- #
diff --git a/community-staging/libvirt/yajl-2.x.patch b/community-staging/libvirt/yajl-2.x.patch
deleted file mode 100644
index 80d3edce0..000000000
--- a/community-staging/libvirt/yajl-2.x.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
-+++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
-@@ -709,7 +709,7 @@
- 
- static int virJSONParserHandleNumber(void * ctx,
-                                      const char * s,
--                                     unsigned int l)
-+                                     size_t l)
- {
-     virJSONParserPtr parser = ctx;
-     char *str = strndup(s, l);
-@@ -735,7 +735,7 @@
- 
- static int virJSONParserHandleString(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
-@@ -756,7 +756,7 @@
- 
- static int virJSONParserHandleMapKey(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONParserStatePtr state;
-@@ -894,14 +894,14 @@
- /* XXX add an incremental streaming parser - yajl trivially supports it */
- virJSONValuePtr virJSONValueFromString(const char *jsonstring)
- {
--    yajl_parser_config cfg = { 1, 1 };
-     yajl_handle hand;
-     virJSONParser parser = { NULL, NULL, 0 };
-     virJSONValuePtr ret = NULL;
- 
-     VIR_DEBUG("string=%s", jsonstring);
- 
--    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
-+    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
-+    yajl_config(hand, yajl_allow_comments, 1);
- 
-     if (yajl_parse(hand,
-                    (const unsigned char *)jsonstring,
-@@ -1002,15 +1002,16 @@
- 
- char *virJSONValueToString(virJSONValuePtr object)
- {
--    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
-     yajl_gen g;
-     const unsigned char *str;
-     char *ret = NULL;
--    unsigned int len;
-+    size_t len;
- 
-     VIR_DEBUG("object=%p", object);
- 
--    g = yajl_gen_alloc(&conf, NULL);
-+    g = yajl_gen_alloc(NULL);
-+    yajl_gen_config(g, yajl_gen_beautify, 0);
-+    yajl_gen_config(g, yajl_gen_indent_string, " ");
- 
-     if (virJSONValueToStringOne(object, g) < 0) {
-         virReportOOMError();
diff --git a/community-staging/mailutils/PKGBUILD b/community-staging/mailutils/PKGBUILD
deleted file mode 100644
index 521f58a01..000000000
--- a/community-staging/mailutils/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 53728 2011-08-07 21:45:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=mailutils
-pkgver=2.2
-pkgrel=3
-pkgdesc="MUA command line tool (mailx)"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/mailutils/"
-license=('GPL')
-depends=('libldap' 'pam' 'gnutls' 'guile')
-makedepends=('python2' 'emacs')
-optdepends=('python2')
-conflicts=('libsieve')
-install=mailutils.install
-options=(zipman !emptydirs)
-source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
-md5sums=('834d2f616b922856127ecfe6c2de7d1a')
-
-build() {
-  cd "$srcdir/mailutils-$pkgver"
-
-  py2=`pacman -Q python2 | cut -d\  -f2 | cut -d. -f1-2`
-  py3=`pacman -Q python | cut -d\  -f2 | cut -d. -f1-2`
-
-  export PYTHON=/usr/bin/python2
-  export PYTHON_CONFIG=/usr/bin/python2-config
-  export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
-
-  [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
-	--libexecdir=/usr/lib/$pkgname --without-fribidi \
-	--without-tcp-wrappers
-#  [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
-  make -j1
-}
-
-package() {
-  cd "$srcdir/mailutils-$pkgver"
-  make -j1 DESTDIR=$pkgdir install
-  rm -f $pkgdir/usr/share/info/dir
-  mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
-  mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
-  chown -R root:root $pkgdir
-}
diff --git a/community-staging/mailutils/mailutils.install b/community-staging/mailutils/mailutils.install
deleted file mode 100644
index 03b451b3e..000000000
--- a/community-staging/mailutils/mailutils.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community-staging/minbif/PKGBUILD b/community-staging/minbif/PKGBUILD
deleted file mode 100644
index 663b6d65a..000000000
--- a/community-staging/minbif/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 53751 2011-08-07 23:40:14Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: AkiraYB <brunoyb!yahoo,com,br>
-
-pkgname=minbif
-pkgver=1.0.4
-pkgrel=4
-pkgdesc='An IRC gateway to IM networks that uses libpurple.'
-arch=('i686' 'x86_64')
-url='http://minbif.im/'
-license=('GPL2')
-depends=('gnutls' 'libcaca' 'libpurple')
-makedepends=('cmake')
-optdepends=('xinetd: to run minbif through xinetd')
-backup=('etc/minbif/minbif.conf'
-        'etc/minbif/minbif.motd')
-install='minbif.install'
-source=("http://minbif.im/attachments/download/90/${pkgname}-${pkgver}.tar.gz"
-        'minbif')
-md5sums=('25069fb6015dfb9ddc24ef2e09e74da3'
-         '307a6fab42bcaeed11a55b5fb4589778')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \
-       ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -dm0755 "${pkgdir}/var/lib"
-  install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif"
-  install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users"
-  install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/minbif/minbif b/community-staging/minbif/minbif
deleted file mode 100644
index 47888d169..000000000
--- a/community-staging/minbif/minbif
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/minbif`
-case "$1" in
-  start)
-    stat_busy "Starting minbif daemon"
-    if [ -z "$PID" ]; then
-      if [ ! -d /var/run/minbif ]; then
-        mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif
-      fi
-      [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid
-      CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \
-                           /etc/minbif/minbif.conf'
-      su -s /bin/sh -c "$CMD" minbif
-
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon minbif
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping minbif daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/minbif/minbif.pid
-      rm_daemon minbif
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/minbif/minbif.install b/community-staging/minbif/minbif.install
deleted file mode 100644
index 264763407..000000000
--- a/community-staging/minbif/minbif.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  grep -qs ^minbif: /etc/group || groupadd -g 67 minbif
-  grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \
-    -d /var/lib/minbif -s /bin/false minbif
-
-  chown -R minbif:minbif /var/lib/minbif
-  chmod 0770 /var/lib/minbif
-  chmod 0770 /var/lib/minbif/users
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  grep -qs ^minbif: /etc/passwd && userdel minbif
-  grep -qs ^minbif: /etc/group && groupdel minbif
-}
diff --git a/community-staging/net6/PKGBUILD b/community-staging/net6/PKGBUILD
deleted file mode 100644
index 1d5a6e025..000000000
--- a/community-staging/net6/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 53842 2011-08-08 20:25:54Z spupykin $
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=net6
-pkgver=1.3.12
-pkgrel=2
-pkgdesc="A library that provides a TCP protocol abstraction for C++"
-arch=('i686' 'x86_64')
-url="http://gobby.0x539.de/"
-license=('LGPL')
-depends=('gnutls' 'libsigc++2.0')
-options=('!libtool')
-source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('506776416d8aea2b9ea13a81f9145383'
-         '18ac67590d6bce0a0a4a6a21af8da429')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Rp1 <$srcdir/build-fix.patch
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/net6/build-fix.patch b/community-staging/net6/build-fix.patch
deleted file mode 100644
index 7e932bce6..000000000
--- a/community-staging/net6/build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp
---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp	2011-08-09 00:19:29.000000000 +0400
-+++ net6-1.3.12/inc/encrypt.hpp	2009-11-15 16:02:46.000000000 +0300
-@@ -34,7 +34,7 @@
- typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
- typedef gnutls_transport_ptr gnutls_transport_ptr_t;
- typedef gnutls_dh_params gnutls_dh_params_t;
--//typedef gnutls_connection_end gnutls_connection_end_t;
-+typedef gnutls_connection_end gnutls_connection_end_t;
- 
- class dh_params: private net6::non_copyable
- {
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp
---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp	2011-08-09 00:20:12.000000000 +0400
-+++ net6-1.3.12/src/encrypt.cpp	2009-11-15 16:02:46.000000000 +0300
-@@ -25,7 +25,7 @@
- {
- 	const unsigned int DH_BITS = 1024;
- 
--	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
-+	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
- 	{
- 		net6::gnutls_session_t session;
- 		gnutls_init(&session, end);
diff --git a/community-staging/nzbget/ChangeLog b/community-staging/nzbget/ChangeLog
deleted file mode 100644
index 74030cd3d..000000000
--- a/community-staging/nzbget/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Fixed FS#19399 - missing postprocess-example.conf file
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.7.0
-
-2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Dependency added (gnutls) in v0.6.0-2 
-
-2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.6.0
-
-2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.5.1
-
-2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
-	* Update to major release 0.5.0
diff --git a/community-staging/nzbget/PKGBUILD b/community-staging/nzbget/PKGBUILD
deleted file mode 100644
index 278e38ac8..000000000
--- a/community-staging/nzbget/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 53834 2011-08-08 19:30:16Z jelle $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=nzbget
-pkgver=0.7.0
-pkgrel=3
-pkgdesc="Downloads from Usenet using .nzb files"
-arch=('i686' 'x86_64')
-url="http://nzbget.sourceforge.net/"
-license=('GPL')
-depends=('gnutls' 'libpar2' 'libxml2' 'ncurses')
-makedepends=('autoconf' 'automake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('27971846aba75f5e312d80dce7edbc5d')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-#  autoreconf -fi || return 1
-#uudeview ("uulib") has been removed, and "it did not work well anyway"
-  ./configure --prefix=/usr --enable-parcheck || return 1
-  make 
-}
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-#other files
-  install -d ${pkgdir}/usr/share/$pkgname || return 1
-  install -m644 -t ${pkgdir}/usr/share/$pkgname \
-    AUTHORS postprocess-example.sh postprocess-example.conf \
-    ChangeLog nzbget.conf.example README || return 1
-}
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
deleted file mode 100644
index d405bd160..000000000
--- a/community-staging/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('121829b854349a9e9d1aebc25cf3e52d')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-staging/qwtpolar-svn/PKGBUILD b/community-staging/qwtpolar-svn/PKGBUILD
deleted file mode 100644
index 79de737a4..000000000
--- a/community-staging/qwtpolar-svn/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Kévin Guilloy <kevin at guilloy dot ath dot cx>
-
-pkgname=qwtpolar-svn
-pkgver=122
-pkgrel=1
-pkgdesc='An extension of the Qwt library to support polar plots.'
-arch=('i686' 'x86_64')
-url="http://qwtpolar.sourceforge.net/"
-license=('Qwt License, Version 1.0')
-depends=('qwt')
-conflicts=('qwtpolar')
-makedepends=('subversion')
-
-_svntrunk='https://qwtpolar.svn.sourceforge.net/svnroot/qwtpolar/trunk/qwtpolar'
-_svnmod='qwtpolar'
-
-build() {
-  svn co ${_svntrunk} ${_svnmod}
-
-  msg 'SVN checkout or server timeout'
-  msg 'Building sofware...'
-
-  cd qwtpolar/
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/doc/\/usr\/share\/doc\/qwt\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/include/\/usr\/include\/qwt\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/lib/\/usr\/lib\//' qwtpolarconfig.pri
-  sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/features/\/usr\/share\/qwt\/features\//' qwtpolarconfig.pri
-  sed -i -e 's/^.*QwtPolarDesigner//' qwtpolarconfig.pri
-  sed -i -e 's/^.*QwtPolarExamples//' qwtpolarconfig.pri
-  echo "INCLUDEPATH += /usr/include/qwt" >> qwtpolarbuild.pri
-
-  qmake
-
-  make
-}
-
-package() {
-  cd qwtpolar
-
-  make INSTALL_ROOT=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/qwtpolar-svn
-  install -m644 COPYING \
-    ${pkgdir}/usr/share/licenses/qwtpolar-svn
-}
diff --git a/community-staging/remmina-plugins/PKGBUILD b/community-staging/remmina-plugins/PKGBUILD
deleted file mode 100644
index 9e4534e2f..000000000
--- a/community-staging/remmina-plugins/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 53731 2011-08-07 21:45:50Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=remmina-plugins
-pkgver=0.9.2
-pkgrel=2
-pkgdesc="Remina plugins"
-#"Remmina supports multiple network protocols in an integrated and consistant user interface.
-# Currently RDP, VNC, XDMCP and SSH are supported."
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/remmina/"
-license=('GPL')
-conflicts=(remmina-plugins-svn)
-depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib)
-makedepends=(intltool pkgconfig gettext perl avahi)
-install=remmina-plugins.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz)
-md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ssh --enable-rdp \
-	--enable-vnc --enable-xdmcp --enable-nx \
-	--enable-telepathy
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/remmina-plugins/remmina-plugins.install b/community-staging/remmina-plugins/remmina-plugins.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-staging/remmina-plugins/remmina-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/rsyslog/PKGBUILD b/community-staging/rsyslog/PKGBUILD
deleted file mode 100644
index 14d38eb88..000000000
--- a/community-staging/rsyslog/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 53982 2011-08-10 20:56:05Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=rsyslog
-pkgver=5.8.4
-pkgrel=2
-pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
-url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib')
-makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
-optdepends=('postgresql-libs: PostgreSQL Database Support'
-	    'libmysqlclient: MySQL Database Support'
-	    'net-snmp'
-	    'gnutls')
-backup=('etc/rsyslog.conf' \
-	'etc/logrotate.d/rsyslog'
-	'etc/conf.d/rsyslog')
-options=('strip' 'zipman' '!libtool')
-source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-	'rsyslog'
-	'rsyslog.logrotate'
-	'rsyslog.conf.d')
-md5sums=('a2c2a65ac84d9a895c52a754aff61986'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
-         '1a0cd4530dd5d1439456d5ae230574d9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --enable-mysql \
-              --enable-pgsql \
-              --enable-mail \
-              --enable-imfile \
-              --enable-imtemplate \
-              --enable-snmp \
-              --enable-gnutls \
-              --enable-inet \
-              --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install DESTDIR=${pkgdir}
-  # Install Daemons and Configuration Files
-  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
-  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
-  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
-  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-}
diff --git a/community-staging/rsyslog/rsyslog b/community-staging/rsyslog/rsyslog
deleted file mode 100755
index ee0145418..000000000
--- a/community-staging/rsyslog/rsyslog
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/rsyslog/rsyslog.conf.d b/community-staging/rsyslog/rsyslog.conf.d
deleted file mode 100644
index e39f8c3b9..000000000
--- a/community-staging/rsyslog/rsyslog.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c4"
diff --git a/community-staging/rsyslog/rsyslog.logrotate b/community-staging/rsyslog/rsyslog.logrotate
deleted file mode 100644
index 76306c560..000000000
--- a/community-staging/rsyslog/rsyslog.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
-    missingok
-    sharedscripts
-    postrotate
-	/usr/bin/killall -HUP /usr/sbin/rsyslogd
-    endscript
-}
diff --git a/community-staging/simgear/PKGBUILD b/community-staging/simgear/PKGBUILD
deleted file mode 100644
index 970dbf82b..000000000
--- a/community-staging/simgear/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=simgear
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
-arch=(i686 x86_64)
-depends=('glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost')
-license=("GPL")
-#url="http://www.simgear.org"
-url="https://gitorious.org/fg"
-options=('!makeflags')
-source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
-	build-fix.patch)
-md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
-         '905a05cc1364c067b3b9574d41cef7fa')
-
-build() {
-  cd $srcdir/fg-simgear
-#  patch -p1 <$srcdir/build-fix.patch
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/fg-simgear
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/simgear/build-fix.patch b/community-staging/simgear/build-fix.patch
deleted file mode 100644
index da4ba81f8..000000000
--- a/community-staging/simgear/build-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
---- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
-@@ -70,9 +70,6 @@
-   osg::ref_ptr<osg::RefMatrix> mModelView;
- };
- 
--osgUtil::RegisterRenderBinProxy
--SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
--
- class SGClipGroup::CullCallback : public osg::NodeCallback {
- public:
-   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
---- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
-@@ -51,8 +51,6 @@
-   class ClipRenderBin;
- 
-   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
--
--  static osgUtil::RegisterRenderBinProxy clipBinProxy;
- };
- 
- #endif
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
---- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
-@@ -21,6 +21,7 @@
- #include <osgDB/ReadFile>
- #include <osgDB/Input>
- #include <osgDB/ParameterOutput>
-+#include <osgDB/DatabasePager>
- 
- #include <simgear/debug/logstream.hxx>
- #include <simgear/structure/OSGVersion.hxx>
-@@ -67,9 +68,12 @@
-     unsigned childNum = getNumChildren();
-     setTimeStamp(childNum, 0);
-     double priority=1.0;
-+/*
-+FIXME:!!!
-     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
-                          getDatabaseRequest(childNum),
-                          _readerWriterOptions.get());
-+*/
- }
- 
- bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
-diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
---- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
-@@ -31,6 +31,7 @@
- #include <simgear/screen/extensions.hxx>
- #include <simgear/screen/RenderTexture.h>
- #include <osg/GLU>
-+#include <GL/glu.h>
- 
- #include "bbcache.hxx"
- 
-diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
---- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
-@@ -145,6 +145,7 @@
- #endif
- 
- #include <osg/GLU>
-+#include <GL/glu.h>
- 
- #include "tr.h"
- 
diff --git a/community-staging/smalltalk/PKGBUILD b/community-staging/smalltalk/PKGBUILD
deleted file mode 100644
index 1be6f7500..000000000
--- a/community-staging/smalltalk/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 53831 2011-08-08 19:25:38Z jelle $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: mrshpot <mrshpot at gmail dot com>
-# Contributor: Michael Fellinger <m.fellinger@gmail.com>
-
-pkgname=smalltalk
-pkgver=3.2.4
-pkgrel=2
-pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
-url='http://smalltalk.gnu.org/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-
-depends=('gmp' 'libffi' 'libsigsegv' 'readline')
-makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip')
-
-source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a36a7c9beddca08dc492b500738efc82')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/smalltalk \
-    --with-imagedir=/var/lib/smalltalk \
-    --enable-gtk=yes \
-    --with-system-libffi \
-    --with-system-libsigsegv \
-    --with-readline \
-    --with-tcl --with-tk \
-    --with-x --without-emacs
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-
-  # fix manpage symlink
-  rm -f $pkgdir/usr/share/man/man1/gst-reload.1
-  ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1
-}
diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD
deleted file mode 100644
index 439e47c9c..000000000
--- a/community-testing/flightgear/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
-makedepends=('boost')
-license=("GPL")
-url="http://www.flightgear.org"
-options=('!makeflags')
-source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
-md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
-
-build() {
-  cd $srcdir/fg-flightgear
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
-#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
-  cd $srcdir/fg-flightgear
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD
deleted file mode 100644
index d405bd160..000000000
--- a/community-testing/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 50969 2011-07-03 18:11:27Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('121829b854349a9e9d1aebc25cf3e52d')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-testing/simgear/PKGBUILD b/community-testing/simgear/PKGBUILD
deleted file mode 100644
index 970dbf82b..000000000
--- a/community-testing/simgear/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=simgear
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
-arch=(i686 x86_64)
-depends=('glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost')
-license=("GPL")
-#url="http://www.simgear.org"
-url="https://gitorious.org/fg"
-options=('!makeflags')
-source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
-	build-fix.patch)
-md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
-         '905a05cc1364c067b3b9574d41cef7fa')
-
-build() {
-  cd $srcdir/fg-simgear
-#  patch -p1 <$srcdir/build-fix.patch
-  [ -x configure ] || ./autogen.sh
-  [ -f Makefile ] || ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/fg-simgear
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/simgear/build-fix.patch b/community-testing/simgear/build-fix.patch
deleted file mode 100644
index da4ba81f8..000000000
--- a/community-testing/simgear/build-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
---- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
-@@ -70,9 +70,6 @@
-   osg::ref_ptr<osg::RefMatrix> mModelView;
- };
- 
--osgUtil::RegisterRenderBinProxy
--SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
--
- class SGClipGroup::CullCallback : public osg::NodeCallback {
- public:
-   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
---- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
-@@ -51,8 +51,6 @@
-   class ClipRenderBin;
- 
-   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
--
--  static osgUtil::RegisterRenderBinProxy clipBinProxy;
- };
- 
- #endif
-diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
---- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
-@@ -21,6 +21,7 @@
- #include <osgDB/ReadFile>
- #include <osgDB/Input>
- #include <osgDB/ParameterOutput>
-+#include <osgDB/DatabasePager>
- 
- #include <simgear/debug/logstream.hxx>
- #include <simgear/structure/OSGVersion.hxx>
-@@ -67,9 +68,12 @@
-     unsigned childNum = getNumChildren();
-     setTimeStamp(childNum, 0);
-     double priority=1.0;
-+/*
-+FIXME:!!!
-     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
-                          getDatabaseRequest(childNum),
-                          _readerWriterOptions.get());
-+*/
- }
- 
- bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
-diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
---- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
-@@ -31,6 +31,7 @@
- #include <simgear/screen/extensions.hxx>
- #include <simgear/screen/RenderTexture.h>
- #include <osg/GLU>
-+#include <GL/glu.h>
- 
- #include "bbcache.hxx"
- 
-diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
---- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
-+++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
-@@ -145,6 +145,7 @@
- #endif
- 
- #include <osg/GLU>
-+#include <GL/glu.h>
- 
- #include "tr.h"
- 
diff --git a/community/musca/PKGBUILD b/community/musca/PKGBUILD
deleted file mode 100644
index 34ab9b843..000000000
--- a/community/musca/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 31936 2010-11-08 00:00:11Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Murtuza Akhtari <inxsible at gmail dot com>
-
-pkgname=musca
-pkgver=0.9.24
-pkgrel=1
-pkgdesc='A simple X11 dynamic window manager with features nicked from ratpoison and dwm.'
-arch=('i686' 'x86_64')
-url='http://aerosuidae.net/musca/'
-license=('GPL3')
-depends=('libx11' 'dmenu')
-source=("http://aerosuidae.net/${pkgname}-${pkgver}.tgz")
-md5sums=('e067a8e39b1a97d62fc8e43800edee70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
-}
diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD
deleted file mode 100644
index 87cc13a32..000000000
--- a/community/ogre/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 52770 2011-07-28 04:02:26Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.7.3
-pkgrel=4
-pkgdesc="A scene-oriented, flexible 3D engine written in C++"
-arch=('i686' 'x86_64')
-url='http://www.ogre3d.org'
-license=('custom:MIT')
-depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' 
-         'nvidia-cg-toolkit' 'mesa' 'zziplib' 'ois')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-optdepends=('cppunit: unit testing'
-            'intel-tbb: better threading support'
-            'poco: portability'
-            'boost: for developing using ogre')
-install=ogre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2")
-md5sums=('7a85d3b8f0d64debd186e48ebe9556aa')
-
-build() {
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}
-
-  # get a clean build dir
-  [[ -d build ]] && rm -rf build
-	mkdir build
-	cd build
-
-  # generate CMake Makefile
-  cmake .. \
- 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \
-	  -DOGRE_INSTALL_SAMPLES=TRUE \
-	  -DOGRE_INSTALL_DOCS=TRUE \
-    -DOGRE_INSTALL_MEDIA=TRUE \
-	  -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-
-  # compile
-  make
-
-  # generate docs
-  if [[ $(which dot) && $(which doxygen) ]]; then
-    make doc
-  fi
-}
-
-package_ogre() {
-  optdepends=('ogre-docs: documentation')
-
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build
-
-  # install the bugger
-  make DESTDIR=${pkgdir} install
-
-  # fix up samples
-  install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
-
-  # make sample launcher
-  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
-  echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
-  chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
-  
-  # install license
-  install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
-
-  # move docs out of this package
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/ogre/ogre.install b/community/ogre/ogre.install
deleted file mode 100644
index 5db668d9e..000000000
--- a/community/ogre/ogre.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE/samples/"
-}
diff --git a/community/thoggen/ChangeLog b/community/thoggen/ChangeLog
deleted file mode 100644
index 45138e297..000000000
--- a/community/thoggen/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2008-06-19 Mateusz Herych <heniekk@gmail.com>
-
-* Updated to 0.7.1
-
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* built for x86_64
diff --git a/community/thoggen/PKGBUILD b/community/thoggen/PKGBUILD
deleted file mode 100644
index 35230b4c0..000000000
--- a/community/thoggen/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 22322 2010-07-20 23:22:32Z mherych $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Maintainer: Robert Emil Berge <filoktetes@linuxophic.org>
-
-pkgname=thoggen
-pkgver=0.7.1
-pkgrel=5
-pkgdesc="A DVD ripper based on GStreamer and Gtk+."
-arch=('i686' 'x86_64')
-url="http://thoggen.net/"
-license=('GPL')
-depends=('libofa' 'perlxml' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-ugly-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ffmpeg' 'libdvdread' 'hal' 'libglade')
-source=(http://downloads.sourceforge.net/sourceforge/thoggen/$pkgname-$pkgver.tar.gz)
-md5sums=('e36c1ceb098f8ed51ca6c0d1e7ae8279')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/core/wget/wget-1.12-CVE-2010-2252.patch b/core/wget/wget-1.12-CVE-2010-2252.patch
deleted file mode 100644
index d1d797a2c..000000000
--- a/core/wget/wget-1.12-CVE-2010-2252.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/doc/wget.texi wget/doc/wget.texi
---- wget~/doc/wget.texi	2010-09-05 15:32:44.000000000 +0200
-+++ wget/doc/wget.texi	2010-09-05 15:32:44.000000000 +0200
-@@ -1487,6 +1487,13 @@
- @code{Content-Disposition} headers to describe what the name of a
- downloaded file should be.
- 
-+@cindex Trust server names
-+@item --trust-server-names
-+
-+If this is set to on, on a redirect the last component of the
-+redirection URL will be used as the local file name.  By default it is
-+used the last component in the original URL.
-+
- @cindex authentication
- @item --auth-no-challenge
- 
-@@ -2797,6 +2804,10 @@
- Turn on recognition of the (non-standard) @samp{Content-Disposition}
- HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
- 
-+@item trust_server_names = on/off
-+If set to on, use the last component of a redirection URL for the local
-+file name.
-+
- @item continue = on/off
- If set to on, force continuation of preexistent partially retrieved
- files.  See @samp{-c} before setting it.
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/http.c wget/src/http.c
---- wget~/src/http.c	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.c	2010-09-05 15:32:44.000000000 +0200
-@@ -2410,8 +2410,9 @@
- /* The genuine HTTP loop!  This is the part where the retrieval is
-    retried, and retried, and retried, and...  */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
--           int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+           char **local_file, const char *referer, int *dt, struct url *proxy,
-+           struct iri *iri)
- {
-   int count;
-   bool got_head = false;         /* used for time-stamping and filename detection */
-@@ -2457,7 +2458,8 @@
-     }
-   else if (!opt.content_disposition)
-     {
--      hstat.local_file = url_file_name (u);
-+      hstat.local_file =
-+        url_file_name (opt.trustservernames ? u : original_url);
-       got_name = true;
-     }
- 
-@@ -2497,7 +2499,7 @@
- 
-   /* Send preliminary HEAD request if -N is given and we have an existing
-    * destination file. */
--  file_name = url_file_name (u);
-+  file_name = url_file_name (opt.trustservernames ? u : original_url);
-   if (opt.timestamping
-       && !opt.content_disposition
-       && file_exists_p (file_name))
-@@ -2852,9 +2854,9 @@
- 
-           /* Remember that we downloaded the file for later ".orig" code. */
-           if (*dt & ADDED_HTML_EXTENSION)
--            downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-+            downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-           else
--            downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+            downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
- 
-           ret = RETROK;
-           goto exit;
-@@ -2885,9 +2887,9 @@
- 
-               /* Remember that we downloaded the file for later ".orig" code. */
-               if (*dt & ADDED_HTML_EXTENSION)
--                downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-+                downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file);
-               else
--                downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file);
-+                downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file);
- 
-               ret = RETROK;
-               goto exit;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/http.h wget/src/http.h
---- wget~/src/http.h	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/http.h	2010-09-05 15:32:44.000000000 +0200
-@@ -33,8 +33,8 @@
- 
- struct url;
- 
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
--		  struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *,
-+                  int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/init.c wget/src/init.c
---- wget~/src/init.c	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/init.c	2010-09-05 15:32:44.000000000 +0200
-@@ -243,6 +243,7 @@
-   { "timeout",          NULL,                   cmd_spec_timeout },
-   { "timestamping",     &opt.timestamping,      cmd_boolean },
-   { "tries",            &opt.ntry,              cmd_number_inf },
-+  { "trustservernames", &opt.trustservernames,  cmd_boolean },
-   { "useproxy",         &opt.use_proxy,         cmd_boolean },
-   { "user",             &opt.user,              cmd_string },
-   { "useragent",        NULL,                   cmd_spec_useragent },
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/main.c wget/src/main.c
---- wget~/src/main.c	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/main.c	2010-09-05 15:32:44.000000000 +0200
-@@ -266,6 +266,7 @@
-     { "timeout", 'T', OPT_VALUE, "timeout", -1 },
-     { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
-     { "tries", 't', OPT_VALUE, "tries", -1 },
-+    { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
-     { "user", 0, OPT_VALUE, "user", -1 },
-     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
-     { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
-@@ -675,6 +676,8 @@
-     N_("\
-   -I,  --include-directories=LIST  list of allowed directories.\n"),
-     N_("\
-+  --trust-server-names  use the name specified by the redirection url last component.\n"),
-+    N_("\
-   -X,  --exclude-directories=LIST  list of excluded directories.\n"),
-     N_("\
-   -np, --no-parent                 don't ascend to the parent directory.\n"),
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/options.h wget/src/options.h
---- wget~/src/options.h	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/options.h	2010-09-05 15:32:44.000000000 +0200
-@@ -242,6 +242,7 @@
-   char *encoding_remote;
-   char *locale;
- 
-+  bool trustservernames;
- #ifdef __VMS
-   int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/retr.c wget/src/retr.c
---- wget~/src/retr.c	2010-09-05 15:30:22.000000000 +0200
-+++ wget/src/retr.c	2010-09-05 15:32:44.000000000 +0200
-@@ -689,7 +689,8 @@
- #endif
-       || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
-     {
--      result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
-+      result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
-+                          proxy_url, iri);
-     }
-   else if (u->scheme == SCHEME_FTP)
-     {
diff --git a/core/wget/wget-1.12-subjectAltName.patch b/core/wget/wget-1.12-subjectAltName.patch
deleted file mode 100644
index 20f08d216..000000000
--- a/core/wget/wget-1.12-subjectAltName.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-=== modified file 'src/openssl.c'
---- src/openssl.c	2009-09-22 16:16:43 +0000
-+++ src/openssl.c	2009-10-24 23:06:44 +0000
-@@ -39,7 +39,7 @@
- #include <string.h>
- 
- #include <openssl/ssl.h>
--#include <openssl/x509.h>
-+#include <openssl/x509v3.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
- 
-@@ -486,9 +486,11 @@
- ssl_check_certificate (int fd, const char *host)
- {
-   X509 *cert;
-+  GENERAL_NAMES *subjectAltNames;
-   char common_name[256];
-   long vresult;
-   bool success = true;
-+  bool alt_name_checked = false;
- 
-   /* If the user has specified --no-check-cert, we still want to warn
-      him about problems with the server's certificate.  */
-@@ -536,7 +538,8 @@
-           break;
-         case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-         case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
--          logprintf (LOG_NOTQUIET, _("  Self-signed certificate encountered.\n"));
-+          logprintf (LOG_NOTQUIET,
-+                     _("  Self-signed certificate encountered.\n"));
-           break;
-         case X509_V_ERR_CERT_NOT_YET_VALID:
-           logprintf (LOG_NOTQUIET, _("  Issued certificate not yet valid.\n"));
-@@ -558,10 +561,6 @@
-   /* Check that HOST matches the common name in the certificate.
-      #### The following remains to be done:
- 
--     - It should use dNSName/ipAddress subjectAltName extensions if
--       available; according to rfc2818: "If a subjectAltName extension
--       of type dNSName is present, that MUST be used as the identity."
--
-      - When matching against common names, it should loop over all
-        common names and choose the most specific one, i.e. the last
-        one, not the first one, which the current code picks.
-@@ -569,50 +568,123 @@
-      - Ensure that ASN1 strings from the certificate are encoded as
-        UTF-8 which can be meaningfully compared to HOST.  */
- 
--  X509_NAME *xname = X509_get_subject_name(cert);
--  common_name[0] = '\0';
--  X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
--                             sizeof (common_name));
-+  subjectAltNames = X509_get_ext_d2i (cert, NID_subject_alt_name, NULL, NULL);
- 
--  if (!pattern_match (common_name, host))
-+  if (subjectAltNames)
-     {
--      logprintf (LOG_NOTQUIET, _("\
--%s: certificate common name %s doesn't match requested host name %s.\n"),
--                 severity, quote_n (0, common_name), quote_n (1, host));
--      success = false;
-+      /* Test subject alternative names */
-+
-+      /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)?
-+       * Signal it by host_in_octet_string. */
-+      ASN1_OCTET_STRING *host_in_octet_string = NULL;
-+      host_in_octet_string = a2i_IPADDRESS (host);
-+
-+      int numaltnames = sk_GENERAL_NAME_num (subjectAltNames);
-+      int i;
-+      for (i=0; i < numaltnames; i++)
-+        {
-+          const GENERAL_NAME *name =
-+            sk_GENERAL_NAME_value (subjectAltNames, i);
-+          if (name)
-+            {
-+              if (host_in_octet_string)
-+                {
-+                  if (name->type == GEN_IPADD)
-+                    {
-+                      /* Check for ipAddress */
-+                      /* TODO: Should we convert between IPv4-mapped IPv6
-+                       * addresses and IPv4 addresses? */
-+                      alt_name_checked = true;
-+                      if (!ASN1_STRING_cmp (host_in_octet_string,
-+                            name->d.iPAddress))
-+                        break;
-+                    }
-+                }
-+              else if (name->type == GEN_DNS)
-+                {
-+                  /* Check for dNSName */
-+                  alt_name_checked = true;
-+                  /* dNSName should be IA5String (i.e. ASCII), however who
-+                   * does trust CA? Convert it into UTF-8 for sure. */
-+                  unsigned char *name_in_utf8 = NULL;
-+                  if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName))
-+                    {
-+                      /* Compare and check for NULL attack in ASN1_STRING */
-+                      if (pattern_match ((char *)name_in_utf8, host) &&
-+                            (strlen ((char *)name_in_utf8) ==
-+                                ASN1_STRING_length (name->d.dNSName)))
-+                        {
-+                          OPENSSL_free (name_in_utf8);
-+                          break;
-+                        }
-+                      OPENSSL_free (name_in_utf8);
-+                    }
-+                }
-+            }
-+        }
-+      sk_GENERAL_NAME_free (subjectAltNames);
-+      if (host_in_octet_string)
-+        ASN1_OCTET_STRING_free(host_in_octet_string);
-+
-+      if (alt_name_checked == true && i >= numaltnames)
-+        {
-+          logprintf (LOG_NOTQUIET,
-+              _("%s: no certificate subject alternative name matches\n"
-+                "\trequested host name %s.\n"),
-+                     severity, quote_n (1, host));
-+          success = false;
-+        }
-     }
--  else
-+  
-+  if (alt_name_checked == false)
-     {
--      /* We now determine the length of the ASN1 string. If it differs from
--       * common_name's length, then there is a \0 before the string terminates.
--       * This can be an instance of a null-prefix attack.
--       *
--       * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
--       * */
--
--      int i = -1, j;
--      X509_NAME_ENTRY *xentry;
--      ASN1_STRING *sdata;
--
--      if (xname) {
--        for (;;)
--          {
--            j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
--            if (j == -1) break;
--            i = j;
-+      /* Test commomName */
-+      X509_NAME *xname = X509_get_subject_name(cert);
-+      common_name[0] = '\0';
-+      X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
-+                                 sizeof (common_name));
-+
-+      if (!pattern_match (common_name, host))
-+        {
-+          logprintf (LOG_NOTQUIET, _("\
-+    %s: certificate common name %s doesn't match requested host name %s.\n"),
-+                     severity, quote_n (0, common_name), quote_n (1, host));
-+          success = false;
-+        }
-+      else
-+        {
-+          /* We now determine the length of the ASN1 string. If it
-+           * differs from common_name's length, then there is a \0
-+           * before the string terminates.  This can be an instance of a
-+           * null-prefix attack.
-+           *
-+           * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
-+           * */
-+
-+          int i = -1, j;
-+          X509_NAME_ENTRY *xentry;
-+          ASN1_STRING *sdata;
-+
-+          if (xname) {
-+            for (;;)
-+              {
-+                j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
-+                if (j == -1) break;
-+                i = j;
-+              }
-           }
--      }
- 
--      xentry = X509_NAME_get_entry(xname,i);
--      sdata = X509_NAME_ENTRY_get_data(xentry);
--      if (strlen (common_name) != ASN1_STRING_length (sdata))
--        {
--          logprintf (LOG_NOTQUIET, _("\
--%s: certificate common name is invalid (contains a NUL character).\n\
--This may be an indication that the host is not who it claims to be\n\
--(that is, it is not the real %s).\n"),
--                     severity, quote (host));
--          success = false;
-+          xentry = X509_NAME_get_entry(xname,i);
-+          sdata = X509_NAME_ENTRY_get_data(xentry);
-+          if (strlen (common_name) != ASN1_STRING_length (sdata))
-+            {
-+              logprintf (LOG_NOTQUIET, _("\
-+    %s: certificate common name is invalid (contains a NUL character).\n\
-+    This may be an indication that the host is not who it claims to be\n\
-+    (that is, it is not the real %s).\n"),
-+                         severity, quote (host));
-+              success = false;
-+            }
-         }
-     }
- 
-@@ -631,3 +703,7 @@
-   /* Allow --no-check-cert to disable certificate checking. */
-   return opt.check_cert ? success : true;
- }
-+
-+/*
-+ * vim: tabstop=2 shiftwidth=2 softtabstop=2
-+ */
-
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
deleted file mode 100644
index 238f6b3b1..000000000
--- a/extra/archboot/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=archboot
-pkgver=2011.08
-pkgrel=1
-pkgdesc="Advanced, modular arch boot/install image creation utility"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1')
-optdepends=('grub2-bios: for grub2 support'
-            'grub2-efi-i386: for grub2 support'
-            'grub2-efi-x86_64: for grub2 support'
-            'efibootmgr: for grub2 support'
-)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
-backup=('etc/archboot/allinone.conf'
-        'etc/archboot/allinone-lts.conf'
-        'etc/archboot/default.conf'
-        'etc/archboot/default-ftp.conf'
-        'etc/archboot/default-pxelinux.conf'
-        'etc/archboot/default-ftp-pxelinux.conf'
-        'etc/archboot/presets/allinone'
-        'etc/archboot/presets/allinone-lts'
-        'etc/archboot/presets/isolinux'
-        'etc/archboot/presets/isolinux-ftp'
-        'etc/archboot/presets/syslinux'
-        'etc/archboot/presets/syslinux-ftp'
-        'etc/archboot/presets/pxelinux'
-        'etc/archboot/presets/pxelinux-ftp'
-)
-install=archboot.install
-
-### to bump the depends list use this:
-#for i in $(grep ^depends= PKGBUILD | sed  -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
-
-build()
-{
-  cd $srcdir/$pkgname-$pkgver-$pkgrel
-  mv * $pkgdir/
-  # vmware-detect
-  cd $startdir/src
-  gcc -o vmware-detect vmware-detect.c
-  install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
-}
-md5sums=('4b71827d6767c99c1144df9215108349'
-         '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install
deleted file mode 100644
index 315f97d7e..000000000
--- a/extra/archboot/archboot.install
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-post_install() {
-  cat << EOF
-ARCHBOOT usage:
----------------
---> Main config files were installed to '/etc/archboot/'.
-    Preset files were installed to '/etc/archboot/presets'.
-    Modify them to your needs.
---> Use the preset files as config file of your build tool:
-    mkisolinux, mksyslinux or mkpxelinux
---> For Allinone ISOs use archboot-allinone.sh
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/extra/archboot/vmware-detect.c b/extra/archboot/vmware-detect.c
deleted file mode 100644
index d242a388d..000000000
--- a/extra/archboot/vmware-detect.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-int main() {
-  unsigned char idtr[6];
-  asm("sidt %0" : "=m" (idtr));
-  if(0xff==idtr[5])
-  {
-    return 0;
-  }
-  else
-  {
-    return 1;
-  }
-}
diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD
deleted file mode 100644
index b6d035b22..000000000
--- a/extra/esound/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=esound
-pkgver=0.2.41
-pkgrel=2
-pkgdesc="Enlightened Sound Daemon"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('audiofile' 'alsa-lib>=1.0.18')
-url="http://www.tux.org/~ricdude/EsounD.html"
-provides=("esd=${pkgver}")
-replaces=('esd')
-conflicts=('esd')
-backup=('etc/esd.conf')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
-	esd-0.2.38-alsa-drain.patch
-	esd)
-md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c'
-         '3de93efcd1bc196a3585e6aef50eac48'
-         'a4c76e7c7f75b201ea7ab6fb15b47472')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-              --with-audiofile --without-libwrap \
-              --enable-alsa --disable-artstest
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd"
-}
diff --git a/extra/esound/esd b/extra/esound/esd
deleted file mode 100755
index d90ef55fa..000000000
--- a/extra/esound/esd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/esd`
-case "$1" in
-  start)
-    stat_busy "Starting Esound Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/esd -nobeeps &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Esound Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/esound/esd-0.2.38-alsa-drain.patch b/extra/esound/esd-0.2.38-alsa-drain.patch
deleted file mode 100644
index f2fb716ba..000000000
--- a/extra/esound/esd-0.2.38-alsa-drain.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- esound-0.2.38/audio_alsa09.c.old	2007-06-11 12:22:24.000000000 +0200
-+++ esound-0.2.38/audio_alsa09.c	2007-06-11 12:22:49.000000000 +0200
-@@ -486,7 +486,7 @@ void esd_audio_flush(void)
- 	}
- 
- 	if (alsa_playback_handle != NULL)
--		snd_pcm_drain( alsa_playback_handle );
-+		snd_pcm_drop( alsa_playback_handle );
-   
- 	if (alsadbg) 
- 		print_state();
diff --git a/extra/hal/PKGBUILD b/extra/hal/PKGBUILD
deleted file mode 100644
index 6eaf1c847..000000000
--- a/extra/hal/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 105528 2011-01-10 10:53:12Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=hal
-pkgver=0.5.14
-pkgrel=6
-pkgdesc="Hardware Abstraction Layer"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16')
-makedepends=('pkgconfig' 'gperf')
-options=('!libtool' '!makeflags')
-install=hal.install
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        hal
-        hal-0.5.9-hide-diagnostic.patch
-        hal-remove-dell-killswitch.patch
-        hal-KVM-evdev.patch
-        hal-HDAPS-blacklist.patch
-        hal-xen-unignore-axes.patch
-        hal-use-at-console.patch
-        fix-libusb-detection.patch
-        dbus-error-init.patch
-        path-max.patch
-        handle-input-touchpad.patch
-        macbook-fix-ioperm.patch
-        hal-ignore-internal-dm-devices.patch)
-md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
-         '277e96ac130d7bfce0b30f0b80db8782'
-         '4d4b6801a1cedca22b8bdd9db73b16fb'
-         '6d87c3e63184ae3a69caafc846f538a3'
-         '6507e5091ee2d11a87ae738a8e2caecb'
-         '1171c2d83b76059f2da7a3538e08fa4e'
-         '52bd305299aa22ae07f1a862c22d30fa'
-         '3f11234fb5e5044fbfc5199ec65b182c'
-         'da088f12cfc2d190bbf95b747e19ab9e'
-         '634f4ec2203eff7de8fa2ed2c6b9cbe0'
-         'f8c9b3a40d03907b498feef571d42466'
-         '0575677614db0632b17b1a719798c7e0'
-         '46a5db3ff896ee37762aa8d7e70942c4'
-         '17bc2b911f245cef4a1d98769d5c4d14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
-  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
-  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
-  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
-  patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
-  patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
-  patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
-  patch -Np1 -i "${srcdir}/dbus-error-init.patch"
-  patch -Np1 -i "${srcdir}/path-max.patch"
-  patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
-  patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
-  patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
-  
-  libtoolize --force
-  aclocal
-  autoconf
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
-      --enable-static=no --disable-acpi-ibm \
-      --disable-docbook-docs --disable-console-kit \
-      --disable-policy-kit --disable-acl-management \
-      --enable-umount-helper --disable-smbios \
-      --with-hal-user=hal --with-hal-group=hal \
-      --with-pid-file=/var/run/hald.pid \
-      --disable-gtk-doc
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/media"
-  install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-  
-  # Fix udev rule location
-  install -d -m755 "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
-}
diff --git a/extra/hal/dbus-error-init.patch b/extra/hal/dbus-error-init.patch
deleted file mode 100644
index fb3ad020a..000000000
--- a/extra/hal/dbus-error-init.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Wed, 30 Dec 2009 11:42:52 +0000
-Subject: linux/probe-input: don't use error prio init
-
-it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is
-called before the error structure is initialized via
-dbus_error_init (&error). This could lead to a segfault during startup
-as seen in dmesg:
-
-|Intel AES-NI instructions are not detected.
-|padlock: VIA PadLock not detected.
-|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000]
-|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000]
-|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000]
-|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000]
-|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000]
-|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000]
-|RPC: Registered udp transport module.
-|RPC: Registered tcp transport module.
-
-What I run into seems to be reported as Debian #562068 [0]. This patch
-makes the segfault go away on my machine.
-
-[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
-index 94e9929..cad47d3 100644
---- a/hald/linux/probing/probe-input.c
-+++ b/hald/linux/probing/probe-input.c
-@@ -70,6 +70,7 @@ main (int argc, char *argv[])
- 	fd = -1;
- 
- 	setup_logger ();
-+	dbus_error_init (&error);
- 
- 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
- 	if (button_type == NULL)
-@@ -96,7 +97,6 @@ main (int argc, char *argv[])
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
---
-cgit v0.8.3-6-g21f6
-From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 24 Feb 2010 16:19:28 +0000
-Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR()
-
-If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is
-called on that error, then it is uninitialized and may segfault.  This
-means that dbus_error_init() must be called before any "goto out" if
-"out:" calls LIBHAL_FREE_DBUS_ERROR().
-
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
-index 45d2084..bffc040 100644
---- a/hald/linux/probing/probe-hiddev.c
-+++ b/hald/linux/probing/probe-hiddev.c
-@@ -57,11 +57,12 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
-index 70b0f86..aaa92e2 100644
---- a/hald/linux/probing/probe-ieee1394-unit.c
-+++ b/hald/linux/probing/probe-ieee1394-unit.c
-@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
- 	if (ieee1394_udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
-index 0b1b912..e911eea 100644
---- a/hald/linux/probing/probe-net-bluetooth.c
-+++ b/hald/linux/probing/probe-net-bluetooth.c
-@@ -141,6 +141,8 @@ main (int argc, char *argv[])
- 	DBusMessage *reply = NULL;
- 	DBusError error;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -151,8 +153,6 @@ main (int argc, char *argv[])
- 
- 	HAL_INFO (("Investigating '%s'", iface));
- 
--	dbus_error_init (&error);
--
- 	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
-index 91ed7bc..7c6d1c6 100644
---- a/hald/linux/probing/probe-printer.c
-+++ b/hald/linux/probing/probe-printer.c
-@@ -66,6 +66,8 @@ main (int argc, char *argv[])
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -73,7 +75,6 @@ main (int argc, char *argv[])
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
-index 0bc9689..15c0d4f 100644
---- a/hald/linux/probing/probe-smbios.c
-+++ b/hald/linux/probing/probe-smbios.c
-@@ -129,6 +129,8 @@ main (int argc, char *argv[])
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -136,7 +138,6 @@ main (int argc, char *argv[])
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
-index 824a82e..dd524ca 100644
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -109,6 +109,8 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -127,7 +129,6 @@ main (int argc, char *argv[])
- 	else
- 		only_check_for_fs = FALSE;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
-index cf913c0..7bc13e8 100644
---- a/hald/linux/probing/probe-video4linux.c
-+++ b/hald/linux/probing/probe-video4linux.c
-@@ -58,6 +58,8 @@ main (int argc, char *argv[])
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
- 	if (device_file == NULL)
- 		goto out;
-@@ -66,7 +68,6 @@ main (int argc, char *argv[])
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	ctx = libhal_ctx_init_direct (&error);
- 	if (ctx == NULL)
- 		goto out;
-diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index 0de1b91..7268fff 100644
---- a/hald/linux/probing/probe-volume.c
-+++ b/hald/linux/probing/probe-volume.c
-@@ -318,6 +318,8 @@ main (int argc, char *argv[])
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -346,7 +348,6 @@ main (int argc, char *argv[])
- 
- 	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/fix-libusb-detection.patch b/extra/hal/fix-libusb-detection.patch
deleted file mode 100644
index d4f966dec..000000000
--- a/extra/hal/fix-libusb-detection.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001
-From: Joe Marcus Clarke <marcus@FreeBSD.org>
-Date: Tue, 08 Dec 2009 00:05:27 +0000
-Subject: Fix libusb detection on Linux
-
-Adjust the FreeBSD libusb20 code so that it does not interfere with the
-Linux libusb detection.
-
-Reported by:	Robby Workman <rw@rlworkman.net>
----
-diff --git a/configure.in b/configure.in
-index a8fda51..8363595 100644
---- a/configure.in
-+++ b/configure.in
-@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
- fi 
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
- 
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- 	    AS_HELP_STRING([--with-backend=<name>],
- 	                   [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
- if test "x$HALD_BACKEND" = "xfreebsd"; then
--    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
--    AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
--fi
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
--if test "x$USE_LIBUSB20" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
--    LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
--    LIBUSB20_LIBS="-lusb"
-+    USE_BSDLIBUSB20=no
-+    USE_BSDLIBUSB=no
-+    LIBUSB20_LIBS=""
-+    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
-+    if test "x$USE_BSDLIBUSB20" = "xno"; then
-+        AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
-+    fi
-+    AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
-+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-+        LIBUSB20_LIBS="-lusb20"
-+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-+        LIBUSB20_LIBS="-lusb"
-+    fi
-+    AC_SUBST(LIBUSB20_LIBS)
-+else
-+    AM_CONDITIONAL([HAVE_LIBUSB20], [false])
- fi
--AC_SUBST(LIBUSB20_LIBS)
- 
- dnl DBUS API is subject to changes
- AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/hal b/extra/hal/hal
deleted file mode 100644
index 012d456ed..000000000
--- a/extra/hal/hal
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        #Check for running dbus, start when not running
-    	ck_daemon dbus && /etc/rc.d/dbus start
-	if [ -x /etc/rc.d/acpid ]; then
-		ck_daemon acpid && /etc/rc.d/acpid start
-	fi
-        stat_busy "Starting Hardware Abstraction Layer"
-        if [ ! -x /var/cache/hald ] ; then
-		install -m755 -g 82 -o 82 -d /var/cache/hald
-        fi
-	if [ ! -x /var/run/hald ]; then
-		install -m755 -g 82 -o 82 -d /var/run/hald
-	fi
-	if [ ! -x /var/run/hald/hald-local ]; then
-		install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
-	fi
-	if [ ! -x /var/run/hald/hald-runner ]; then
-		install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
-	fi
-	/usr/sbin/hald
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon hal
-		stat_done
-	fi
-        ;;
-    stop)
-	stat_busy "Stopping Hardware Abstraction Layer"
-	[ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon hal
-		stat_done
-	fi
-	;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/extra/hal/hal-0.5.9-hide-diagnostic.patch b/extra/hal/hal-0.5.9-hide-diagnostic.patch
deleted file mode 100644
index 58c882d77..000000000
--- a/extra/hal/hal-0.5.9-hide-diagnostic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig	2007-05-01 21:39:31.000000000 +0000
-+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-05-01 21:51:14.000000000 +0000
-@@ -100,6 +100,11 @@
- 	</match>
-       </match>
- 
-+      <!-- Hide partitions marked as Compaq Diagnostics -->
-+      <match key="volume.partition.type" string="0x12">
-+        <merge key="volume.ignore" type="bool">true</merge>
-+      </match>
-+
-       <!-- EFI firmware partitions -->
-       <match key="volume.fstype" string="vfat">
- 	<match key="volume.label" string="EFI">
diff --git a/extra/hal/hal-HDAPS-blacklist.patch b/extra/hal/hal-HDAPS-blacklist.patch
deleted file mode 100644
index 8a6822817..000000000
--- a/extra/hal/hal-HDAPS-blacklist.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 25 Jun 2009 09:47:27 +1000
-Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X.
-
-This device posts accelerometer data through ABS_X/ABS_Y, making X unusable
-if it's controlling the pointer.
----
- fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index a342421..89ba672 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -38,5 +38,11 @@
-         <merge key="input.x11_driver" type="string">evdev</merge>
-       </match>
-     </match>
-+
-+    <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-+         Posts accel data through ABS_X/ABS_Y, makes X unusable -->
-+    <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-+        <remove key="input.x11_driver" />
-+    </match>
-   </device>
- </deviceinfo>
--- 
-1.6.3.rc1.2.g0164.dirty
-
diff --git a/extra/hal/hal-KVM-evdev.patch b/extra/hal/hal-KVM-evdev.patch
deleted file mode 100644
index 917655ed1..000000000
--- a/extra/hal/hal-KVM-evdev.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 20 Mar 2009 14:37:24 +1000
-Subject: [PATCH] Add x11_driver for American Megatrends KVM.
-
-This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick
-assigned but not input.mouse, hence the default evdev mapping doesn't pick up
-on it.
-
-Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 769f75b..eb9767e 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -2,6 +2,12 @@
- <deviceinfo version="0.2">
-   <device>
- 
-+    <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
-+         set by hal and doesn't get picked up by default -->
-+    <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
-+       <merge key="input.x11_driver" type="string">evdev</merge>
-+    </match>
-+
-     <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
-     <match key="input.product" contains="QEMU USB Tablet">
-        <merge key="input.x11_driver" type="string">evdev</merge>
--- 
-1.6.0.6
-
diff --git a/extra/hal/hal-ignore-internal-dm-devices.patch b/extra/hal/hal-ignore-internal-dm-devices.patch
deleted file mode 100644
index 9ad8656ca..000000000
--- a/extra/hal/hal-ignore-internal-dm-devices.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Tue, 13 Jul 2010 14:07:32 +0000
-Subject: HAL: Ignore internal DM devices with new DM udev rules
-
-With new device-mapper udev rules are /dev/mapper/* symlinks
-to basic device name /dev/dm-X.
-(Change requested by udev upstream.)
-
-This change breaks temporary-cryptsetup workaround inside hal.
-
-With new dm-udev rules (uncluded since device-mapper 1.02.39)
-there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
-which controls that scan should be ignored for this device
-(it is set for all internal devices, including temporary cryptsetup,
-internal parts of lvm devices etc.)
-
-Ignore device if this flag is set.
-
-See bugs
-https://bugzilla.redhat.com/show_bug.cgi?id=613909
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index a8233fd..6d616bc 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
- 				g_free (str);
- 			}
- 			g_free (dstr);
-+		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
-+			if (strtoul(&key[33], NULL, 10) == 1) {
-+				HAL_INFO (("ignoring device requested by DM udev rules"));
-+				goto invalid;
-+			}
- 		}
- 	}
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/hal-remove-dell-killswitch.patch b/extra/hal/hal-remove-dell-killswitch.patch
deleted file mode 100644
index ae0cf7a2b..000000000
--- a/extra/hal/hal-remove-dell-killswitch.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux	2008-08-22 07:34:47.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux	2009-03-03 10:45:20.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--  DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	value="`hal-system-sonypic getbluetooth`"
-@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	    exit 1
- 	fi
- 	exit ${value}
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_bt
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--        else
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
- 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
- 	if [ $? -eq 0 ]; then
-@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	echo "Access type not supported" >&2
- 	exit 1
-     fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
-- 	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wlan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--   	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wwan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
- else
-     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-     echo "Killswitch type not supported" >&2
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux	2008-10-24 09:45:54.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux	2009-03-03 10:44:49.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--    DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	hal-system-sonypic setbluetooth $value
-@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	    exit 1
- 	fi
- 	exit 0
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --bt 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --bt 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--	        exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
-         if [ "$value" = "true" ]; then 
- 	    bit=1; 
-@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- 	echo "Access type not supported" >&2
- 	exit 1
-     fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wlan 0 --wlan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wlan 0 --wlan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wwan 0 --wwan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wwan 0 --wwan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
- else
-     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-     echo "Killswitch type not supported" >&2
diff --git a/extra/hal/hal-use-at-console.patch b/extra/hal/hal-use-at-console.patch
deleted file mode 100644
index 0b32f17f0..000000000
--- a/extra/hal/hal-use-at-console.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in
---- hal-0.5.13/hal.conf.in.drop-polkit	2009-02-04 17:07:23.000000000 -0500
-+++ hal-0.5.13/hal.conf.in	2009-07-29 23:15:16.866766074 -0400
-@@ -25,7 +25,41 @@
-            send_interface="org.freedesktop.Hal.Device"/>
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Manager"/>
-+  </policy>
-+
-+  <!-- Only allow users at the local console to manipulate devices -->
-+  <policy at_console="true">
-+    <allow send_destination="org.freedesktop.Hal"
-+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
-+
-+  </policy>
- 
-+  <!-- well,...and root too -->
-+  <policy user="root">
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-     <allow send_destination="org.freedesktop.Hal"
diff --git a/extra/hal/hal-xen-unignore-axes.patch b/extra/hal/hal-xen-unignore-axes.patch
deleted file mode 100644
index b248639b7..000000000
--- a/extra/hal/hal-xen-unignore-axes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 19 Oct 2009 14:27:20 +1000
-Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer.
-
-The evdev-internal axis type picking fails for the Xen Virtual Pointer as it
-exposes both relative and absolute axes. Evdev picks the relative axes by
-default, leading to a immovable pointer if the Xen backend only sends
-absolute coordinates.
-
-Explicitly tell evdev to not ignore the absolute axes.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=523914
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 89ba672..752c4ab 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -44,5 +44,12 @@
-     <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-         <remove key="input.x11_driver" />
-     </match>
-+
-+    <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
-+         Mouse does not move in PV Xen guest -->
-+    <match key="info.product" contains="Xen Virtual Pointer">
-+      <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
-+      <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
-+    </match>
-   </device>
- </deviceinfo>
--- 
-1.6.2.5
-
diff --git a/extra/hal/hal.install b/extra/hal/hal.install
deleted file mode 100644
index d6afee384..000000000
--- a/extra/hal/hal.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
-  getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
-  getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
-  getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
-  getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
-  usr/bin/passwd -l hal &>/dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-post_remove() {
-  if getent passwd hal &>/dev/null; then
-    usr/sbin/userdel hal
-  fi
-  if getent group hal &>/dev/null; then
-    usr/sbin/groupdel hal
-  fi
-}
diff --git a/extra/hal/handle-input-touchpad.patch b/extra/hal/handle-input-touchpad.patch
deleted file mode 100644
index 9cd646422..000000000
--- a/extra/hal/handle-input-touchpad.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001
-From: Michael Witten <mfwitten@gmail.com>
-Date: Wed, 06 Jan 2010 00:53:17 +0000
-Subject: Policy: handle `input.touchpad' explicitly
-
-This commit essentially duplicates the policy for:
-
-   <match key="info.capabilities" contains="input.mouse">
-
-and then changes `input.mouse' to `input.touchpad'. This
-is necessary because in Linus Torvalds's Linux repo:
-
-    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-
-the following commit:
-
-    commit 7105d2ea73e1391b681d0e1212c42f561c64d429
-    Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-    Date:   Fri Dec 11 23:54:54 2009 -0800
-
-        Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
-
-        Relative events are only reported via secondary device therefore device
-        associated with the touchpad should not advertise these capabilities.
-
-        Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-
-made these few changes:
-
-    diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-    index a3f492a..b03e7e0 100644
-    /--- a/drivers/input/mouse/alps.c
-    /+++ b/drivers/input/mouse/alps.c
-    /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse)
-     	if (alps_hw_init(psmouse))
-     		goto init_fail;
-
-    +	/*
-    +	 * Undo part of setup done for us by psmouse core since touchpad
-    +	 * is not a relative device.
-    +	 */
-    +	__clear_bit(EV_REL, dev1->evbit);
-    +	__clear_bit(REL_X, dev1->relbit);
-    +	__clear_bit(REL_Y, dev1->relbit);
-    +
-    +	/*
-    +	 * Now set up our capabilities.
-    +	 */
-     	dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
-     	dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
-     	dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
-
-so that HAL no longer adds:
-
-    input.mouse
-
-to an ALPS touchpad's:
-
-    info.capabilities
-
-so that HAL no longer marks the ALPS touchpad with:
-
-    input.x11_driver = 'evdev'
-
-because the policy file:
-
-    fdi/policy/10osvendor/10-x11-input.fdi
-
-doesn't define the policy for:
-
-    <match key="info.capabilities" contains="input.touchpad">
-
-which was previous unnecessary because everything used to
-be caught by the policy for:
-
-    <match key="info.capabilities" contains="input.mouse">
-
-Signed-off-by: Michael Witten <mfwitten@gmail.com>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index cff8fc5..8bbe263 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -16,6 +16,14 @@
-       </match>
-     </match>
- 
-+    <match key="info.capabilities" contains="input.touchpad">
-+      <merge key="input.x11_driver" type="string">mouse</merge>
-+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+             string="Linux">
-+        <merge key="input.x11_driver" type="string">evdev</merge>
-+      </match>
-+    </match>
-+
-     <match key="info.capabilities" contains="input.tablet">
-       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-              string="Linux">
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/macbook-fix-ioperm.patch b/extra/hal/macbook-fix-ioperm.patch
deleted file mode 100644
index 14d0b392d..000000000
--- a/extra/hal/macbook-fix-ioperm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Thu, 25 Feb 2010 10:25:18 +0000
-Subject: Fix incorrect arguments to ioperm() call
-
-The second argument of ioperm() is not the last port to be accessed
-but rather length of the port range [port, port + len).
-
-Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
-index e869192..54e4ea3 100644
---- a/hald/linux/addons/addon-imac-backlight.c
-+++ b/hald/linux/addons/addon-imac-backlight.c
-@@ -158,7 +158,8 @@ main (int argc, char **argv)
- 		goto out;
- 	}
- 
--	if (ioperm(0xB2, 0xB3, 1) < 0)
-+	/* Allow access to ports 0xB2 and 0xB3 */
-+	if (ioperm(0xB2, 2, 1) < 0)
- 	{
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
-diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
-index 2a6fef6..c1bbbac 100644
---- a/hald/linux/addons/addon-macbookpro-backlight.c
-+++ b/hald/linux/addons/addon-macbookpro-backlight.c
-@@ -507,7 +507,8 @@ main (int argc, char *argv[])
-  	state = INREG(0x7ae4);
-  	OUTREG(0x7ae4, state);
- 
--	if (ioperm (0x300, 0x304, 1) < 0) {
-+	/* Allow access to porta 0x300 through 0x304 */
-+	if (ioperm (0x300, 5, 1) < 0) {
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
- 	}
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/hal/path-max.patch b/extra/hal/path-max.patch
deleted file mode 100644
index 304185d7d..000000000
--- a/extra/hal/path-max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 04 Jan 2010 15:56:13 +0000
-Subject: Bump HAL_PATH_MAX to 4096
-
-Some bits in the code use realpath() with destination paths of size
-HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than
-HAL_PATH_MAX (which was 512 until now).
-
-Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which
-apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on
-Linux), to avoid potential buffer overflows and also fix hal on Linux when
-enabling FORTIFY in gcc.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=25888
----
-diff --git a/hald/util.h b/hald/util.h
-index c2a1584..7883333 100644
---- a/hald/util.h
-+++ b/hald/util.h
-@@ -38,7 +38,7 @@
- #endif
- 
- #define HAL_NAME_MAX 256
--#define HAL_PATH_MAX 512
-+#define HAL_PATH_MAX 4096
- 
- gboolean hal_util_remove_trailing_slash (gchar *path);
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch
deleted file mode 100644
index d4dc794ad..000000000
--- a/extra/sip/fix-regression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1308852953 -3600
-# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4
-# Parent  df42f6bf92c8cd12dd7cc5a30231728a4c23ead4
-Fixed a regression introduced in the recent sipIsPyMethod() changes in the
-handling of special methods implemented by object (eg. __lt__).
-
-diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in
---- a/siplib/siplib.c.in	Thu Jun 23 17:24:41 2011 +0100
-+++ b/siplib/siplib.c.in	Thu Jun 23 19:15:53 2011 +0100
-@@ -7604,9 +7604,10 @@
- #endif
- 
-         /*
--         * Check any possible reimplementation is not the wrapped C++ method.
-+         * Check any possible reimplementation is not the wrapped C++ method or
-+         * a default special method implementation..
-          */
--        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type)
-+        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type)
-         {
-             reimp = cls_attr;
-             break;
-
diff --git a/staging/claws-mail/PKGBUILD b/staging/claws-mail/PKGBUILD
deleted file mode 100644
index b395a6177..000000000
--- a/staging/claws-mail/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 134940 2011-08-09 15:03:29Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=claws-mail
-pkgver=3.7.9
-pkgrel=5
-pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering'
-            'html2ps:		AUR pkg - adds support for printing html mails together with html plugins')
-replaces=('sylpheed-claws')
-provides=('claws')
-options=(!libtool)
-install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
-        claws-notify-crash.patch)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
-         '9a2903449f679344b5f5f51c91825b45')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np0 -i $srcdir/claws-notify-crash.patch
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
-  ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --disable-dillo-viewer-plugin \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --enable-jpilot
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # build and install extra tools
-  cd tools
-  make
-   # all executables and .conf files ; only top directory
-  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-      install -D -m755 ${i} \
-        ${pkgdir}/usr/lib/claws-mail/tools/${i}
-  done
-}
diff --git a/staging/claws-mail/claws-mail.install b/staging/claws-mail/claws-mail.install
deleted file mode 100644
index 648480c3b..000000000
--- a/staging/claws-mail/claws-mail.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/staging/claws-mail/claws-notify-crash.patch b/staging/claws-mail/claws-notify-crash.patch
deleted file mode 100644
index e1d4eb686..000000000
--- a/staging/claws-mail/claws-notify-crash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/main.c
-===================================================================
-RCS file: //claws/src/main.c,v
-retrieving revision 1.115.2.237
-retrieving revision 1.115.2.238
-diff -u -r1.115.2.237 -r1.115.2.238
---- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
-+++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
-@@ -331,7 +331,7 @@
- 		gtk_widget_show(hack);
- 	}
- 
--	xdisplay = gdk_display_get_default();
-+	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
- 	sn_display = sn_display_new(xdisplay,
- 				sn_error_trap_push,
- 				sn_error_trap_pop);
-
diff --git a/staging/cups/PKGBUILD b/staging/cups/PKGBUILD
deleted file mode 100644
index 628600839..000000000
--- a/staging/cups/PKGBUILD
+++ /dev/null
@@ -1,148 +0,0 @@
-# $Id: PKGBUILD 134929 2011-08-09 13:34:46Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.4.8
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	cups-avahi.patch
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6'
-         '8ebd390197501ffd709f0ee546937fd5'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         'c9ede95cfc8e76571bd8156f0a573e3b'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-# move client.conf man page for next update to the client pkg.
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch
-
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  
-  # Rebuild configure script for --enable-avahi.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --disable-ldap \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --disable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-pdftops=pdftops \
-     --with-optim="$CFLAGS"
-
-     #reminder
-     #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - deamon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/mime.convs
-        etc/cups/mime.types
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/client.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module'
-            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
-	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-  
-  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
-  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-#  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-}
diff --git a/staging/cups/cups b/staging/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/staging/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/staging/cups/cups-avahi.patch b/staging/cups/cups-avahi.patch
deleted file mode 100644
index cf1056a75..000000000
--- a/staging/cups/cups-avahi.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
-diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
---- cups-1.4.5/backend/dnssd.c.avahi	2009-08-08 00:27:12.000000000 +0200
-+++ cups-1.4.5/backend/dnssd.c	2010-11-12 13:13:31.000000000 +0100
-@@ -22,6 +22,7 @@
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-  *   get_device()            - Create or update a device.
-+*    find_device()
-  *   query_callback()        - Process query data.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-@@ -33,7 +34,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -52,7 +64,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -64,6 +81,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -77,6 +108,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *regtype,
- 					      const char *replyDomain,
- 					      void *context);
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain);
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
- 				       uint16_t rrclass, uint16_t rdlen,
- 				       const void *rdata, uint32_t ttl,
- 				       void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain);
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * cups_txt_records_t access functions
-+ */
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("ERROR: Unable to create avahi client");
-+    return (1);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
-                best = NULL, count = 0;
-            device;
- 	   device = (cups_device_t *)cupsArrayNext(devices))
-+#ifdef HAVE_DNSSD
-         if (!device->ref && !device->sent)
- 	{
- 	 /*
-@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
-  * 'browse_callback()' - Browse devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +621,14 @@ browse_callback(
- 
-   get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-  * 'browse_local_callback()' - Browse local devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_local_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +674,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
-   exit(CUPS_BACKEND_STOP);
- }
- 
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp") ||
-+      !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp.") ||
-+      !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
- 
- /*
-  * 'get_device()' - Create or update a device.
-@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp.") ||
--      !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
-@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
-  * 'query_callback()' - Process query data.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- query_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +889,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +923,212 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp.") ||
--      strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }  
-+}
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (strcasecmp(device->name, dkey.name) ||
--        strcasecmp(device->domain, dkey.domain))
-+    if (strcasecmp(device->name, dkey->name) ||
-+        strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) >= dataend)
--	  break;
--
--        datanext = data + datalen;
-+	char *key;
-+	char *value;
- 
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
--
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
--	}
--	else
--	  continue;
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
-+	key = txt->key;
-+	value = txt->value;
-         if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
-@@ -805,6 +1183,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -854,11 +1236,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in
---- cups-1.4.5/config.h.in.avahi	2010-08-13 06:11:46.000000000 +0200
-+++ cups-1.4.5/config.h.in	2010-11-12 13:13:31.000000000 +0100
-@@ -344,6 +344,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4
---- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi	2009-08-29 00:54:34.000000000 +0200
-+++ cups-1.4.5/config-scripts/cups-dnssd.m4	2010-11-12 13:13:31.000000000 +0100
-@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
-diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
---- cups-1.4.5/cups/http-support.c.avahi	2010-10-02 00:40:38.000000000 +0200
-+++ cups-1.4.5/cups/http-support.c	2010-11-12 13:28:45.000000000 +0100
-@@ -55,6 +55,11 @@
- #  include <dns_sd.h>
- #  include <poll.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
- 					 void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1351,16 +1374,27 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
-     DNSServiceRef	ref,		/* DNS-SD master service reference */
- 			domainref,	/* DNS-SD service reference for domain */
- 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0,	/* Send the domain resolve? */
- 			offline = 0;	/* offline-report state set? */
--    char		*regtype,	/* Pointer to type in hostname */
--			*domain;	/* Pointer to domain in hostname */
-     _http_uribuf_t	uribuf;		/* URI buffer */
-     struct pollfd	polldata;	/* Polling data */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
- 
- 
-     if (logit)
-@@ -1398,8 +1432,13 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer  = resolved_uri;
-     uribuf.bufsize = resolved_size;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+#endif
- 
-     resolved_uri[0] = '\0';
- 
-@@ -1414,6 +1453,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1500,6 +1540,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (logit)
-     {
-@@ -1511,13 +1581,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if (logit && !uri)
-       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1722,6 +1792,105 @@ resolve_callback(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $".
diff --git a/staging/cups/cups-no-export-ssllibs.patch b/staging/cups/cups-no-export-ssllibs.patch
deleted file mode 100644
index 9be3c819b..000000000
--- a/staging/cups/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- 
diff --git a/staging/cups/cups-no-gcrypt.patch b/staging/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 203b4f4ac..000000000
--- a/staging/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.4.7.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.4.7/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
-@@ -74,7 +74,6 @@
-     dnl Then look for GNU TLS...
-     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
- 	if $PKGCONFIG --exists gnutls; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
-@@ -96,16 +95,6 @@
- 	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
- 	fi
--
--	if test $have_ssl = 1; then
--            if $PKGCONFIG --exists gcrypt; then
--	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
--	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
--	    elif test "x$LIBGCRYPTCONFIG" != x; then
--	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
--	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
--	    fi
--	fi
-     fi
- 
-     dnl Check for the OpenSSL library last...
-diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h
---- cups-1.4.7.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.4.7/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
-@@ -98,7 +98,6 @@
-  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
-  */
- #    include <gnutls/gnutls.h>
--#    include <gcrypt.h>
- 
- typedef struct
- {
diff --git a/staging/cups/cups.install b/staging/cups/cups.install
deleted file mode 100644
index 47c3d9b82..000000000
--- a/staging/cups/cups.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
- echo ">> If you use an HTTPS connection to CUPS, the first time you access"
- echo ">> the interface it may take a very long time before the site comes up."
- echo ">> This is because the first request triggers the generation of the CUPS"
- echo ">> SSL certificates which can be a very time-consuming job."
-}
-
-post_upgrade() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "daemon script has been renamed to /etc/rc.d/cupsd"
-    echo "change your entry in  /etc/rc.conf"
-  fi
-}
-
-post_remove() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-}
diff --git a/staging/cups/cups.logrotate b/staging/cups/cups.logrotate
deleted file mode 100644
index 9c49bbdaf..000000000
--- a/staging/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/staging/cups/cups.pam b/staging/cups/cups.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/staging/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/staging/empathy/PKGBUILD b/staging/empathy/PKGBUILD
deleted file mode 100644
index 952c577d6..000000000
--- a/staging/empathy/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 134982 2011-08-09 18:33:31Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=empathy
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server'
-         'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-butterfly: MSN support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-sofiasip: SIP support'
-            'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/empathy/empathy.install b/staging/empathy/empathy.install
deleted file mode 100644
index 63dd6b907..000000000
--- a/staging/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/glib-networking/PKGBUILD b/staging/glib-networking/PKGBUILD
deleted file mode 100644
index dc775a49b..000000000
--- a/staging/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134916 2011-08-09 12:05:52Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=glib-networking
-pkgver=2.28.7
-pkgrel=3
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/glib-networking/glib-networking.install b/staging/glib-networking/glib-networking.install
deleted file mode 100644
index 595f1c75b..000000000
--- a/staging/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/gnome-vfs/PKGBUILD b/staging/gnome-vfs/PKGBUILD
deleted file mode 100644
index 5b98fc8e8..000000000
--- a/staging/gnome-vfs/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 135094 2011-08-10 09:17:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-vfs
-pkgver=2.24.4
-pkgrel=5
-pkgdesc="The GNOME Virtual File System"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-vfs.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
-        gnutls-config.patch
-        gcrypt-config.patch)
-sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
-            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
-            'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #Fix build with new gnutls
-  patch -Np1 -i "${srcdir}/gnutls-config.patch"
-  #fix build with new libgcrypt >= 1.5.0
-  patch -Np1 -i "${srcdir}/gcrypt-config.patch"
-  libtoolize --force
-  gtkdocize
-  aclocal
-  autoconf
-  automake
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --disable-hal \
-      --enable-avahi --disable-howl \
-      --disable-openssl --enable-gnutls
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/gnome-vfs/gcrypt-config.patch b/staging/gnome-vfs/gcrypt-config.patch
deleted file mode 100644
index 8ce91870a..000000000
--- a/staging/gnome-vfs/gcrypt-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0
---- gnome-vfs-2.24.4/configure.in	2010-07-01 12:36:09.000000000 -0300
-+++ gnome-vfs-2.24.4-libgcrypt//configure.in	2011-07-22 15:55:02.296325640 -0300
-@@ -689,6 +689,16 @@
- AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue)
-
- dnl ****************************
-+dnl LibGCrypt 1.5.0
-+dnl ****************************
-+
-+AM_PATH_LIBGCRYPT(1.5.0)
-+
-+if test "x${LIBGCRYPT_LIBS}" = "x"; then
-+	AC_MSG_ERROR([unable to find libgcrypt])
-+fi
-+
-+dnl ****************************
- dnl DNS-SD implementations
- dnl ****************************
- AM_CONDITIONAL(HAVE_AVAHI, false)
-@@ -1045,8 +1055,8 @@
- dnl ==============================================================================
-
- PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
--LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
--LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
-+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS"
-+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS  $LIBGCRYPT_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)
- AC_SUBST(LIBGNOMEVFS_LIBS)
-
diff --git a/staging/gnome-vfs/gnome-vfs.install b/staging/gnome-vfs/gnome-vfs.install
deleted file mode 100644
index 793a3e7ab..000000000
--- a/staging/gnome-vfs/gnome-vfs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-vfs
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/staging/gnome-vfs/gnutls-config.patch b/staging/gnome-vfs/gnutls-config.patch
deleted file mode 100644
index f6fa18b17..000000000
--- a/staging/gnome-vfs/gnutls-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-# Use pkg-config in place of gnutls own macro since it's not present anymore.
---- a/configure.in	2009-03-07 19:59:53.805507753 +0100
-+++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
-@@ -686,14 +686,14 @@
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
-     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
- 
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
-+						    have_ssl=true],
-+						    AC_MSG_ERROR([Unable to find GNUTLS]))
-     fi
-   fi
- fi
diff --git a/staging/gnutls/PKGBUILD b/staging/gnutls/PKGBUILD
deleted file mode 100644
index 232866e8e..000000000
--- a/staging/gnutls/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 135280 2011-08-12 06:48:04Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-	align.patch)
-md5sums=('0677a66667f48810ff8df8335a9a9f9b'
-         'bce979498addb45d0fa8d6951f93fab3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix AES-NI for i686
-  patch -Np1 -i ${srcdir}/align.patch
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--without-p11-kit
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}
diff --git a/staging/gnutls/align.patch b/staging/gnutls/align.patch
deleted file mode 100644
index dce5cf408..000000000
--- a/staging/gnutls/align.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
---- a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
-   uint8_t iv[16];
- };
- 
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+        ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
-   struct aes_ctx *ctx = _ctx;
-   int ret;
- 
--  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+  ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key));
-   if (ret != 0)
-     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
--  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+  ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec));
-   if (ret != 0)
-     return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
-@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1);
-   return 0;
- }
- 
-@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0);
- 
-   return 0;
- }
-diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
-index 8f49ff3..20a169e 100644
---- a/lib/accelerated/intel/aes-x86.h
-+++ b/lib/accelerated/intel/aes-x86.h
-@@ -11,10 +11,11 @@ void register_x86_crypto (void);
- # define ALIGN16
- #endif
- 
-+#define AES_KEY_ALIGN_SIZE 8
- #define AES_MAXNR 14
- typedef struct
- {
--  uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
-+  uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
-   int rounds;
- } AES_KEY;
- 
diff --git a/staging/gnutls/gnutls.install b/staging/gnutls/gnutls.install
deleted file mode 100644
index 9ce7c6edc..000000000
--- a/staging/gnutls/gnutls.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/staging/gtk-vnc/PKGBUILD b/staging/gtk-vnc/PKGBUILD
deleted file mode 100644
index b8e4c8856..000000000
--- a/staging/gtk-vnc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 134864 2011-08-08 05:59:44Z eric $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=gtk-vnc
-pkgver=0.4.3
-pkgrel=2
-pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/gtk-vnc"
-license=('LGPL')
-depends=('gtk3')
-optdepends=('gtk2: GTK2 widget')
-makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377')
-
-build() {
-  cd "$srcdir"
-  cp -a $pkgname-$pkgver gtk3-build
-
-  ( cd $pkgname-$pkgver
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --disable-static --with-gtk=2.0
-    make )
-
-  ( cd gtk3-build
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --with-examples --disable-static --with-gtk=3.0
-    make )
-}
-
-package() {
-  cd "${srcdir}"
-  make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install
-  make -C gtk3-build -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/staging/lftp/PKGBUILD b/staging/lftp/PKGBUILD
deleted file mode 100644
index 9cd8e8d15..000000000
--- a/staging/lftp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134943 2011-08-09 15:13:13Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=lftp
-pkgver=4.3.1
-pkgrel=2
-pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
-optdepends=('perl: needed for convert-netscape-cookies and verify-file')
-makedepends=('autoconf')
-url="http://lftp.yar.ru/"
-backup=('etc/lftp.conf')
-source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ea45acfb47b5590d4675c50dc0c6e13c')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-gnutls \
-	--without-openssl --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib
-}
-\ No newline at end of file
diff --git a/staging/libepc/PKGBUILD b/staging/libepc/PKGBUILD
deleted file mode 100644
index 55d302e51..000000000
--- a/staging/libepc/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libepc
-pkgver=0.3.11
-pkgrel=2
-pkgdesc="Easy Publish and Consume Library"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://live.gnome.org/libepc"
-depends=('gtk2' 'avahi' 'libsoup')
-makedepends=('intltool')
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD
deleted file mode 100644
index 58ef7b358..000000000
--- a/staging/libgpod/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134924 2011-08-09 13:21:55Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/staging/libimobiledevice/PKGBUILD b/staging/libimobiledevice/PKGBUILD
deleted file mode 100644
index a6f48d786..000000000
--- a/staging/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 134921 2011-08-09 12:21:53Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd')
-makedepends=('swig' 'python2')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        swig-version-check.patch)
-md5sums=('cdc13037e822d9ac2e109536701d153a'
-         '8bb215e36fe0e08a72332c108c7842cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # SWIG version check is wrong (still not fixed upstream)
-  patch -p1 -i "$srcdir"/swig-version-check.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libimobiledevice/swig-version-check.patch b/staging/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/staging/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/staging/libvncserver/PKGBUILD b/staging/libvncserver/PKGBUILD
deleted file mode 100644
index 1b45fd593..000000000
--- a/staging/libvncserver/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 134732 2011-08-07 19:13:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=libvncserver
-pkgver=0.9.8
-pkgrel=3
-pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
-arch=('i686' 'x86_64')
-url="http://libvncserver.sourceforge.net/"
-license=('GPL')
-depends=('libjpeg' 'zlib' 'gnutls')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
-
-build() {
-  cd "${srcdir}/LibVNCServer-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/LibVNCServer-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch b/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch
deleted file mode 100644
index 5bca69c0c..000000000
--- a/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
-index 21c1bc2..ae8de94 100644
---- a/loudmouth/lm-connection.c
-+++ b/loudmouth/lm-connection.c
-@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection      *connection,
- 	connection->effective_jid = g_strdup_printf ("%s/%s", 
- 		connection->jid, connection->resource);
- 
- 	if (connection->use_sasl) {
-+		gchar *domain = NULL;
-+
-+		if (!connection_get_server_from_jid (connection->jid, &domain)) {
-+			domain = g_strdup (connection->server);
-+		}
-+
- 		lm_sasl_authenticate (connection->sasl,
- 				      username, password,
--				      connection->server,
-+				      domain,
- 				      connection_sasl_auth_finished);
-+		g_free (domain);
- 
- 		connection->features_cb  =
- 			lm_message_handler_new (connection_features_cb,
diff --git a/staging/loudmouth/03-drop-stanzas-on-fail.patch b/staging/loudmouth/03-drop-stanzas-on-fail.patch
deleted file mode 100644
index 87b86a998..000000000
--- a/staging/loudmouth/03-drop-stanzas-on-fail.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
-Date: Tue, 13 Jan 2009 11:28:44 +0000
-Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
-
-when a stanza comes in that for some reason can't be parsed into an LmMessage,
-just drop them on the floor instead of blocking the parser. I've seen this
-issue happen in practise because some (buggy?) client sending an iq with a
-prefix e.g. <client:iq xmlns:client="jabber:client" ... />
----
- loudmouth/lm-parser.c |   15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
-index 1938d56..89f6675 100644
---- a/loudmouth/lm-parser.c
-+++ b/loudmouth/lm-parser.c
-@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext  *context,
- 		if (!m) {
- 			g_warning ("Couldn't create message: %s\n",
- 				   parser->cur_root->name);
--			return;
--		}
--
--		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
-+		} else {
-+			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
- 		       "Have a new message\n");
--		if (parser->function) {
--			(* parser->function) (parser, m, parser->user_data);
-+			if (parser->function) {
-+				(* parser->function) (parser, m, parser->user_data);
-+			}
-+			lm_message_unref (m);
- 		}
- 
--		lm_message_unref (m);
- 		lm_message_node_unref (parser->cur_root);
--		
--			
- 		parser->cur_node = parser->cur_root = NULL;
- 	} else {
- 		LmMessageNode *tmp_node;
--- 
-1.5.6.5
-
diff --git a/staging/loudmouth/04-use-pkg-config-for-gnutls.patch b/staging/loudmouth/04-use-pkg-config-for-gnutls.patch
deleted file mode 100644
index 20f388e89..000000000
--- a/staging/loudmouth/04-use-pkg-config-for-gnutls.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: use pkg-config to detect gnutls
-Debian: http://bugs.debian.org/529835
-Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
-
---- a/configure.ac.orig	2009-08-16 20:29:36.000000000 +0200
-+++ b/configure.ac	2009-08-16 20:30:43.000000000 +0200
-@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
- enable_ssl=no
- if test "x$ac_ssl" = "xgnutls"; then
-   dnl Look for GnuTLS
--  AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
--  if test "x$have_libgnutls" = "xyes"; then
--    CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
--    LIBS="$LIBS $LIBGNUTLS_LIBS"
-+  PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
-+  if test "x$have_gnutls" = "xyes"; then 
-+    AC_SUBST(ASYNCNS_CFLAGS)
-+    AC_SUBST(ASYNCNS_LIBS)
-+    CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
-+    LIBS="$LIBS $GNUTLS_LIBS"
-     AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
-     enable_ssl=GnuTLS
-   else
diff --git a/staging/loudmouth/PKGBUILD b/staging/loudmouth/PKGBUILD
deleted file mode 100644
index d1686df56..000000000
--- a/staging/loudmouth/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Brice Carpentier <brice.carpentier@orange.fr>
-
-pkgname=loudmouth
-pkgver=1.4.3
-pkgrel=3
-pkgdesc="A lightweight Jabber client library written in C/Glib"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://groups.google.com/group/loudmouth-dev"
-depends=('glib2' 'gnutls' 'libidn')
-options=('!libtool')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
-        01-fix-sasl-md5-digest-uri.patch
-        03-drop-stanzas-on-fail.patch
-        04-use-pkg-config-for-gnutls.patch)
-md5sums=('55339ca42494690c3942ee1465a96937'
-         'dc799cea18b24847b1e008c7424010a3'
-         'b7b2d81b01a5eee5fd5e21cae67b4af7'
-         'bffb25b9551df43255fe1706588582f3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
-  patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
-  patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
-  libtoolize --force
-  autoreconf
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/msmtp/PKGBUILD b/staging/msmtp/PKGBUILD
deleted file mode 100644
index 44d3e6209..000000000
--- a/staging/msmtp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 134900 2011-08-08 19:38:44Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Ben Mazer <blm@groknil.org>
-
-pkgname=msmtp
-pkgver=1.4.24
-pkgrel=3
-pkgdesc="A mini smtp client"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://msmtp.sourceforge.net"
-depends=('gnutls' 'libidn')
-makedepends=('texlive-core')
-provides=('smtp-forwarder')
-install=msmtp.install
-source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
-  make
-  make -C doc html pdf
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-  make DESTDIR="${pkgdir}" -C doc install-html install-pdf
-
-# Installing example configs and scripts to /usr/share/doc/msmtp
-# as they are not installed by default (Debian and Gentoo do it this way)
-  install -d "${pkgdir}/usr/share/doc/msmtp"
-  cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/"
-  install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/"
-
-  install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim"
-}
diff --git a/staging/msmtp/msmtp.install b/staging/msmtp/msmtp.install
deleted file mode 100644
index c4dd76476..000000000
--- a/staging/msmtp/msmtp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(msmtp.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/nettle/PKGBUILD b/staging/nettle/PKGBUILD
deleted file mode 100644
index e079a16f8..000000000
--- a/staging/nettle/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 134726 2011-08-07 17:54:31Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: bender02 at gmx dot com
-
-pkgname=nettle
-pkgver=2.2
-pkgrel=1
-pkgdesc="A low-level cryptographic library"
-arch=('i686' 'x86_64')
-url="http://www.lysator.liu.se/~nisse/nettle/"
-license=('GPL2')
-install=$pkgname.install
-depends=('gmp')
-source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=('9a9c6102eb9909019f8a13b67578cdfe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --libdir=/usr/lib \
-	--enable-shared \
-	--disable-static # <-- seems not working now
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-  
-  # remove static libs
-  rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
-}
diff --git a/staging/nettle/nettle.install b/staging/nettle/nettle.install
deleted file mode 100644
index 3d19b5f19..000000000
--- a/staging/nettle/nettle.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(nettle.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/staging/qemu-kvm/65-kvm.rules b/staging/qemu-kvm/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/staging/qemu-kvm/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/staging/qemu-kvm/PKGBUILD b/staging/qemu-kvm/PKGBUILD
deleted file mode 100644
index 604d55da4..000000000
--- a/staging/qemu-kvm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 135315 2011-08-12 16:52:46Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu-kvm
-pkgver=0.15.0
-pkgrel=2
-pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=(i686 x86_64)
-license=('GPL2' 'LGPL2.1')
-url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
-makedepends=('texi2html' 'perl' 'python2')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu-kvm.install
-conflicts=('qemu')
-provides=('qemu')
-replaces=('kvm')
-source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-    cd ${srcdir}/${pkgname}-${pkgver}
-    # fix esound building
-    ./configure --prefix=/usr \
-                --python=/usr/bin/python2 \
-                --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss \
-                --audio-card-list=ac97,sb16,es1370,hda \
-                --enable-docs
-    make
-}
-package()
-{
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-    # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm
-    # fix man page
-    mv ${pkgdir}/usr/share/man/man1/qemu.1 \
-                     ${pkgdir}/usr/share/man/man1/qemu-kvm.1
-    # install udev rules
-    install -D -m644 ${srcdir}/65-kvm.rules \
-                     ${pkgdir}/lib/udev/rules.d/65-kvm.rules
-    # strip scripts directory
-    find ${pkgdir}/usr/bin  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-}
-md5sums=('b45b0deebba4ce47dcaaab3807f6ed47'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/staging/qemu-kvm/qemu-kvm.install b/staging/qemu-kvm/qemu-kvm.install
deleted file mode 100644
index 84aa773b9..000000000
--- a/staging/qemu-kvm/qemu-kvm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu-kvm -enable-kvm' to use KVM."
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  groupdel kvm
-}
diff --git a/staging/telepathy-gabble/PKGBUILD b/staging/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 04a19b6a9..000000000
--- a/staging/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134985 2011-08-09 18:45:11Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.12.4
-pkgrel=2
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('428962565d568667d3ff1aa7eee3da51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/telepathy-gabble/telepathy-gabble.install b/staging/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/staging/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/vino/PKGBUILD b/staging/vino/PKGBUILD
deleted file mode 100644
index ddd37f61e..000000000
--- a/staging/vino/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 134988 2011-08-09 18:47:51Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.0.3
-pkgrel=2
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --enable-gnome-keyring \
-      --enable-avahi
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/vino/vino.install b/staging/vino/vino.install
deleted file mode 100644
index 469266843..000000000
--- a/staging/vino/vino.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vino
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index c7d6642bf..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 135024 2011-08-09 21:18:13Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.11
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-            'libpulse: PulseAudio support')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install
deleted file mode 100644
index 4a1091bc5..000000000
--- a/staging/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD
deleted file mode 100644
index 6e53c7d86..000000000
--- a/staging/weechat/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 135012 2011-08-09 21:04:57Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: lucke <lucke at o2 dot pl>
-
-pkgname=weechat
-pkgver=0.3.5
-pkgrel=3
-pkgdesc="Fast, light and extensible IRC client (curses UI)"
-arch=('i686' 'x86_64')
-url="http://www.weechat.org/"
-license=('GPL')
-depends=('gnutls')
-makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
-optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
-options=('!libtool')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0d2a089bfbfa550e0c65618a171fb3c4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  mkdir build
-  cd build
-  cmake .. -DPREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-
-  make DESTDIR="${pkgdir}/" install
-}
diff --git a/staging/wireshark/PKGBUILD b/staging/wireshark/PKGBUILD
deleted file mode 100644
index 66b2f859c..000000000
--- a/staging/wireshark/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 134932 2011-08-09 14:19:48Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=(wireshark-cli wireshark-gtk)
-pkgbase=wireshark
-pkgver=1.6.1
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
-url="http://www.wireshark.org/"
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('dc1e8c9800b64130674b120a183e2308')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
-
-  ./configure \
-      --prefix=/usr \
-      --with-ssl \
-      --with-zlib=yes \
-      --with-lua
-  make all
-}
-
-package_wireshark-cli() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "$pkgdir/usr/bin/wireshark"
-}
-
-package_wireshark-gtk() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend"
-  depends=('gtk2' 'wireshark-cli')
-  install=wireshark-gtk.install
-  replaces=(wireshark)
-  conflicts=(wireshark)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
-  for d in 16 32 48; do
-      install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
-  done
-  install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
-}
diff --git a/staging/wireshark/wireshark-gtk.install b/staging/wireshark/wireshark-gtk.install
deleted file mode 100644
index 6b1b64bdd..000000000
--- a/staging/wireshark/wireshark-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/wireshark/wireshark.install b/staging/wireshark/wireshark.install
deleted file mode 100644
index 6585ba272..000000000
--- a/staging/wireshark/wireshark.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
-    
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-}
-
-post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
-    fi
-}
diff --git a/staging/xfce4-mailwatch-plugin/PKGBUILD b/staging/xfce4-mailwatch-plugin/PKGBUILD
deleted file mode 100644
index 4a992bd09..000000000
--- a/staging/xfce4-mailwatch-plugin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 134951 2011-08-09 15:38:12Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Suzy Williams <suzanne.williams3@verizon.net>
-
-pkgname=xfce4-mailwatch-plugin
-pkgver=1.1.0
-pkgrel=4
-pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
-	xfce4-mailwatch-plugin-1.1.0-underlink.patch)
-md5sums=('f84dce86be1d7f25f169f262aaacee4e'
-         '47fe8588e3bb642e1b507a854927e6db')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # fix for panel4.8 from Fedora
-  patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch
-  xdt-autogen
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
deleted file mode 100644
index ada0df041..000000000
--- a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am	2008-08-26 03:42:36.000000000 +0100
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new	2011-01-14 17:27:44.116199383 +0000
-@@ -50,6 +50,7 @@
- 	-I$(top_srcdir)/libmailwatch-core \
- 	@GTHREAD_CFLAGS@ \
- 	@LIBXFCE4PANEL_CFLAGS@ \
-+	@LIBXFCEGUI4_CFLAGS@ \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DLOCALEDIR=\"$(localedir)\"
- 
-@@ -60,7 +61,9 @@
- 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
- 	@GTHREAD_LIBS@ \
- 	@LIBXFCE4PANEL_LIBS@ \
--	@GNUTLS_LIBS@
-+	@LIBXFCEGUI4_LIBS@ \
-+	@GNUTLS_LIBS@ \
-+	-lgcrypt
- 
- if HAVE_CYGWIN
-   xfce4_mailwatch_plugin_LDFLAGS += \
diff --git a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/staging/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/xmlsec/PKGBUILD b/staging/xmlsec/PKGBUILD
deleted file mode 100644
index c15a0ac98..000000000
--- a/staging/xmlsec/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 134954 2011-08-09 15:50:09Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
-
-pkgname=xmlsec
-pkgver=1.2.18
-pkgrel=2
-pkgdesc="XML Security Library is a C library based on LibXML2"
-license=('custom')
-arch=(i686 x86_64)
-url="http://www.aleksey.com/xmlsec/index.html"
-depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz)
-md5sums=('8694b4609aab647186607f79e1da7f1a')
-
-build() {
-  cd ${srcdir}/${pkgname}1-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/${pkgname}1-$pkgver"
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}1-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
deleted file mode 100644
index 0a361a0d5..000000000
--- a/testing/iw/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 135459 2011-08-13 23:03:17Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=3.0
-pkgrel=1
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
-url="http://wireless.kernel.org/en/users/Documentation/iw"
-license=("GPL")
-depends=("libnl")
-makedepends=("kernel-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD
deleted file mode 100644
index 9dc460d16..000000000
--- a/testing/openvpn/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 135441 2011-08-13 17:34:29Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=openvpn
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
-url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2' 'iproute2')
-license=('custom')
-backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
-        etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
-        openvpn.rc
-        openvpn-tapdev.rc
-        openvpn-tapdev.conf)
-md5sums=('500bee5449b29906150569aaf2eb2730'
-         'a3809b9727f0c2af2d0770f5c7442db2'
-         'd2c48e970088d679dd3c2afd914ff731'
-         '722f483c9e3ce2ec66d3301aaf7cf3d5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
-    --prefix=/usr \
-    --enable-password-save \
-    --mandir=/usr/share/man \
-    --enable-iproute2
-  make
-
-  # Build plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    make
-  done
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  # Install openvpn
-  make DESTDIR=$pkgdir install
-  install -d -m755 $pkgdir/etc/openvpn
-  # Install examples
-  install -d -m755 $pkgdir/usr/share/openvpn
-  cp -r sample-config-files $pkgdir/usr/share/openvpn/examples
-  find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \;
-  find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \;
-  # Install license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  # Install plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
-    cd -
-  done
-  # Install contrib
-  install -d -m755 $pkgdir/usr/share/openvpn/contrib
-  cp -r contrib $pkgdir/usr/share/openvpn
-  # Install easy-rsa
-  cd $srcdir/$pkgname-$pkgver
-  make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
-  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
-  # Install rc scripts
-  install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
-  install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
-  install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev
-}
diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/testing/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/testing/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
-  start)
-    stat_busy "Creating tap devices for OpenVPN ... "
-    success=0
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn-tapdev
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Destroying tap devices for OpenVPN ..."
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    rm_daemon openvpn-tapdev
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/testing/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenVPN ... "
-    success=0
-    mkdir -p "${STATEDIR}"
-    for cfg in "${CFGDIR}"/*.conf; do
-      stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenVPN ..."
-    for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${pidfile}" .pid) "
-      kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
-      rm -f "${pidfile}"
-    done
-    rm_daemon openvpn
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 04a19b6a9..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 134985 2011-08-09 18:45:11Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.12.4
-pkgrel=2
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('428962565d568667d3ff1aa7eee3da51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD
deleted file mode 100644
index 43a6c0535..000000000
--- a/testing/wget/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 135027 2011-08-09 21:59:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=wget
-pkgver=1.13
-pkgrel=1
-pkgdesc="A network utility to retrieve files from the Web"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/wget/wget.html"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'openssl')
-optdepends=('ca-certificates: HTTPS downloads')
-backup=('etc/wgetrc')
-install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('48c5384123156e7b7501d2f5b5c7189a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Note : We do not build with --enable-nls, because there is a bug in wget causing
-  # international domain names to be not properly converted to punycode if
-  # the current locale is a UTF-8 one
-  # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
-
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
-
-  # remove IRI option from wgetrc as it does not work (see above)
-  sed -i '118,120d' $pkgdir/etc/wgetrc
-
-}
diff --git a/testing/wget/wget.install b/testing/wget/wget.install
deleted file mode 100644
index 8eb6a2c3f..000000000
--- a/testing/wget/wget.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(wget.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
author	Parabola <dev@list.parabolagnulinux.org>	2011-08-16 14:12:41 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2011-08-16 14:12:41 +0000
commit	3abfc1ebef5936241997dd882938581c91743ee9 (patch)
tree	2115f0512eb82f91f0a536d20631bed8eb37f47a
parent	ea595018ba8ae00d7030ff296ec4f50e122d2ea9 (diff)