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

Conflicts: community-staging/wml/PKGBUILD community/exaile/PKGBUILD community/libquicktime/PKGBUILD community/mime-editor/PKGBUILD community/rutilt/PKGBUILD community/synbak/PKGBUILD community/thunar-thumbnailers/PKGBUILD community/tripwire/PKGBUILD community/wifi-radar/PKGBUILD community/xulrunner-oss/PKGBUILD core/bash/PKGBUILD core/shadow/PKGBUILD extra/audacity/PKGBUILD extra/clucene/PKGBUILD extra/darcs/PKGBUILD extra/fprint_demo/PKGBUILD extra/haskell-binary/PKGBUILD extra/haskell-dataenc/PKGBUILD extra/haskell-hashed-storage/PKGBUILD extra/haskell-haskeline/PKGBUILD extra/haskell-mmap/PKGBUILD extra/haskell-tar/PKGBUILD extra/haskell-terminfo/PKGBUILD extra/haskell-utf8-string/PKGBUILD extra/libfprint/PKGBUILD extra/liferea/PKGBUILD extra/llvm/PKGBUILD extra/pam_fprint/PKGBUILD extra/windowmaker-extra/PKGBUILD kde-unstable/kdebindings-python/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libao/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-07-01 19:40:51 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-07-01 19:40:51 -0300
commit: 3dc4525661db2630038e019a2a31b71fdcbfb74a (patch)
tree: ea19d09158589c89b949b8cc80d5cd61f8d5b64e
parent: e41246bc4c78478a71fe801a745210c931c5f2c5 (diff)
parent: 76400556d9e8a5dedc692487c13b76a541813a23 (diff)
283 files changed, 795 insertions, 12912 deletions
diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE
new file mode 100644
index 000000000..7d6035775
--- /dev/null
+++ b/community-staging/python-bsddb/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2008-2009 Jesus Cea Avion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+\ No newline at end of file
diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD
new file mode 100644
index 000000000..578d0921d
--- /dev/null
+++ b/community-staging/python-bsddb/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgbase=python-bsddb
+pkgname=('python2-bsddb' 'python-bsddb')
+_hgrel=600
+pkgver=5.1.2.${_hgrel}
+pkgrel=1
+pkgdesc="Python interface for BerkeleyDB"
+license=('MIT')
+arch=('i686' 'x86_64')
+url="http://www.jcea.es/programacion/pybsddb.htm"
+makedepends=('python2-distribute' 'python-distribute' 'mercurial')
+source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz"
+        'LICENSE')
+sha1sums=('50e7b4c9c11b06c6d871dd93af1cc228687a0227'
+         'ef4e4caf618781104dbf5824279ed39d127b4713')
+
+# source PKGBUILD && mksource
+mksource() {
+   _hgroot="http://hg.jcea.es/pybsddb/"
+   _hgrepo=pybsddb
+   [ -d "${_hgrepo}" ] && hg pull -u -r ${_hgrel} || hg clone ${_hgroot} -r ${_hgrel}
+
+  _dirname=${pkgbase}-${pkgver}
+  mv ${_hgrepo} ${_dirname}
+  tar -cJvf ${_dirname}.src.tar.xz ${_dirname}
+  rm -fr ${_dirname}
+}
+
+build () {
+  cd "${srcdir}"
+  
+  cp -r ${pkgbase}-${pkgver}{,-python2}
+
+  # Build python 3 module
+  cd ${pkgbase}-${pkgver}
+  python setup.py --berkeley-db=/usr build
+
+  # Build python 2 module
+  cd ../${pkgbase}-${pkgver}-python2
+  python2 setup.py --berkeley-db=/usr build
+}
+
+package_python2-bsddb() {
+  depends=('db' 'python2>=2.7')
+  cd "${srcdir}/${pkgbase}-${pkgver}-python2"
+
+  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python-bsddb() {
+  depends=('db' 'python>=3.2')
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD
deleted file mode 100644
index eb089f8ec..000000000
--- a/community-testing/clementine/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z stephane $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=clementine
-pkgver=0.7.1
-pkgrel=6
-pkgdesc="A music player and library organizer"
-url="http://www.clementine-player.org/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice')
-makedepends=('cmake' 'boost')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-        clementine-0.7.1-fix-devicekit.patch)
-sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142'
-          'd595e2746949363680e0d64fe2fb97b524c8d27c')
-install=clementine.install
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch
deleted file mode 100644
index 797a2c864..000000000
--- a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in
---- clementine-0.7.1.ori/src/config.h.in	2011-03-29 12:16:15.000000000 -0700
-+++ clementine-0.7.1/src/config.h.in	2011-05-09 16:00:26.505080057 -0700
-@@ -29,6 +29,7 @@
- #cmakedefine HAVE_STATIC_SQLITE
- 
- #cmakedefine HAVE_DBUS
-+#cmakedefine HAVE_DEVICEKIT
- #cmakedefine HAVE_GIO
- #cmakedefine HAVE_IMOBILEDEVICE
- #cmakedefine HAVE_LIBARCHIVE
diff --git a/community-testing/clementine/clementine.install b/community-testing/clementine/clementine.install
deleted file mode 100644
index 2d71a7563..000000000
--- a/community-testing/clementine/clementine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/darcs/PKGBUILD b/community-testing/darcs/PKGBUILD
deleted file mode 100644
index d23e917a5..000000000
--- a/community-testing/darcs/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Simo Leone <neotuli@gmail.com>
-
-pkgname=darcs
-pkgver=2.5.2
-pkgrel=1.1
-pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
-arch=(i686 x86_64)
-url="http://darcs.net/"
-license=('GPL')
-depends=('curl' 'gmp' 'ncurses>=5.6-7')
-makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12'
-    'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7'
-    'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94')
-source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz")
-md5sums=('491b6ca01dec245a16112ad2c7e07dc1')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs configure --ghc -O --prefix=/usr \
-         --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup.lhs build
-}
-
-check() {
-    cd ${srcdir}/$pkgname-$pkgver
-    runhaskell Setup.lhs test
-}
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs copy --destdir=$pkgdir
-    rm -r $pkgdir/usr/lib/ 
-    chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1   
-}
-
diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD
deleted file mode 100644
index 0eebe2691..000000000
--- a/community-testing/gtk2hs-buildtools/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 50208 2011-06-26 20:13:31Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.0
-pkgrel=3
-pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
-url="http://hackage.haskell.org/package/gtk2hs-buildtools"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy')
-depends=('gmp')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('cbcdfd6031725d8b70ff7804f8d93648')
-
-build() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/gtk2hs-cairo/PKGBUILD b/community-testing/gtk2hs-cairo/PKGBUILD
deleted file mode 100644
index cb3fc256b..000000000
--- a/community-testing/gtk2hs-cairo/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50211 2011-06-26 20:14:36Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=cairo
-pkgname=gtk2hs-cairo
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'cairo' 'haskell-mtl=2.0.1.0')
-makedepends=(gtk2hs-buildtools)
-options=('strip')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('e17c7ce086062282dbb405bfdf68191e')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0')
-
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/gtk2hs-cairo/gtk2hs-cairo.install b/community-testing/gtk2hs-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community-testing/gtk2hs-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/gtk2hs-glib/PKGBUILD b/community-testing/gtk2hs-glib/PKGBUILD
deleted file mode 100644
index e15d65554..000000000
--- a/community-testing/gtk2hs-glib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50214 2011-06-26 20:15:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=glib
-pkgname=gtk2hs-glib
-pkgver=0.12.0
-pkgrel=3
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'glib2')
-makedepends=('gtk2hs-buildtools=0.12.0')
-options=('strip')
-install=gtk2hs-glib.install
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('2f334374d14a2f3e221a2ebfce1f8817')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" "glib2")
-
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/gtk2hs-glib/gtk2hs-glib.install b/community-testing/gtk2hs-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community-testing/gtk2hs-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/gtk2hs-pango/PKGBUILD b/community-testing/gtk2hs-pango/PKGBUILD
deleted file mode 100644
index 603918954..000000000
--- a/community-testing/gtk2hs-pango/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50217 2011-06-26 20:24:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=pango
-pkgname=gtk2hs-pango
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo')
-makedepends=('gtk2hs-buildtools=0.12.0')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0260ed21d6ca2a52ebaa0aa212390cf7')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'pango' 'gtk2hs-glib' 'gtk2hs-cairo')
-
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/gtk2hs-pango/gtk2hs-pango.install b/community-testing/gtk2hs-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community-testing/gtk2hs-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD
deleted file mode 100644
index c52029b85..000000000
--- a/community-testing/haddock/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-pkgname=haddock
-pkgver=2.9.2
-pkgrel=2
-pkgdesc="Documentation-generation tool for Haskell libraries"
-url="http://hackage.haskell.org/package/${pkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=(alex happy)
-depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') 
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-    mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal
-}
-
-md5sums=('04928e132827a1da20ace52babb43e47')
diff --git a/community-testing/haddock/haddock.install b/community-testing/haddock/haddock.install
deleted file mode 100644
index 278da355e..000000000
--- a/community-testing/haddock/haddock.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haddock
-post_install() {
-  ${HS_DIR}/register.sh &> /dev/null
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh &> /dev/null
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
-}
diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD
deleted file mode 100644
index f682bb59a..000000000
--- a/community-testing/haskell-binary/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=binary
-pkgname=haskell-binary
-pkgver=0.5.0.2
-pkgrel=7.1
-pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
-url="http://hackage.haskell.org/package/binary"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install
deleted file mode 100644
index 0084ebef8..000000000
--- a/community-testing/haskell-binary/haskell-binary.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-binary
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD
deleted file mode 100644
index cd94ed17c..000000000
--- a/community-testing/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.13.0.4
-pkgrel=3.2
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/community-testing/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD
deleted file mode 100644
index a7a4be130..000000000
--- a/community-testing/haskell-ghc-paths/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=ghc-paths
-pkgname=haskell-ghc-paths
-pkgver=0.1.0.8
-pkgrel=4.1
-pkgdesc="Knowledge of GHC's installation directories"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d2b23dc563888e380588501d2ce1d82b')
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install
deleted file mode 100644
index 4fd2c6c56..000000000
--- a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-ghc-paths
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD
deleted file mode 100644
index 5a6124fd3..000000000
--- a/community-testing/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.6.3.2
-pkgrel=2.2
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d75863f63a1cfb499d0198e4f28ac2af')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community-testing/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD
deleted file mode 100644
index b8d0a95a3..000000000
--- a/community-testing/haskell-hslogger/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50221 2011-06-26 21:42:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=hslogger
-pkgname=haskell-hslogger
-pkgver=1.1.0
-pkgrel=5
-pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-options=('strip')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('8039e079338dae19e1273bbd73332014')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
-	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
-	--enable-library-profiling
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
-
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-hslogger/haskell-hslogger.install b/community-testing/haskell-hslogger/haskell-hslogger.install
deleted file mode 100644
index 2a0d98ae7..000000000
--- a/community-testing/haskell-hslogger/haskell-hslogger.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hslogger
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-mmap/PKGBUILD b/community-testing/haskell-mmap/PKGBUILD
deleted file mode 100644
index b1002be46..000000000
--- a/community-testing/haskell-mmap/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=mmap
-pkgname=haskell-mmap
-pkgver=0.5.7
-pkgrel=3.2
-pkgdesc="Memory mapped files for POSIX and Windows"
-url="http://hackage.haskell.org/package/mmap"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1f74b3f59617332b06e277f5212423c1')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-mmap/haskell-mmap.install b/community-testing/haskell-mmap/haskell-mmap.install
deleted file mode 100644
index 68fe74f4e..000000000
--- a/community-testing/haskell-mmap/haskell-mmap.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mmap
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD
deleted file mode 100644
index 459f288bd..000000000
--- a/community-testing/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=tar
-pkgname=haskell-tar
-pkgver=0.3.1.0
-pkgrel=4.2
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('10b54856495f9ef0a42aa270085c7d5e')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install
deleted file mode 100644
index e8c2f6293..000000000
--- a/community-testing/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD
deleted file mode 100644
index 51e968853..000000000
--- a/community-testing/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.1.3
-pkgrel=4.2
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('8c0e052340f628b76f5687fa23379628')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/community-testing/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index e6d27dfad..000000000
--- a/community-testing/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.6
-pkgrel=7.2
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/community-testing/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD
deleted file mode 100644
index c8a9ae0f9..000000000
--- a/community-testing/haskell-x11-xft/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 49962 2011-06-22 19:43:36Z vegai $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-_hkgname=X11-xft
-pkgname=haskell-x11-xft
-pkgver=0.3
-pkgrel=19.4
-pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.0-7.3' 'haskell-utf8-string=0.3.6-7.2' 'libxft')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-install=haskell-x11-xft.install
-md5sums=('1b4a528a2a4fe5e9de715f6758ff9015')
-
-build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install
deleted file mode 100644
index a0ff8dac8..000000000
--- a/community-testing/haskell-x11-xft/haskell-x11-xft.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD
deleted file mode 100644
index 417b6daab..000000000
--- a/community-testing/haskell-x11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 49953 2011-06-22 19:21:47Z vegai $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: shild <sxp@bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.5.0.0
-pkgrel=7.3
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('ec6670f5ce1812206903c8a0fd9df04c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install
deleted file mode 100644
index 45c23b979..000000000
--- a/community-testing/haskell-x11/hsmod.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/libquicktime/PKGBUILD b/community-testing/libquicktime/PKGBUILD
deleted file mode 100644
index 5fe871b79..000000000
--- a/community-testing/libquicktime/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 49623 2011-06-18 18:04:57Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=libquicktime
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="A library for reading and writing quicktime files."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://libquicktime.sourceforge.net/"
-depends=('gtk2'  'ffmpeg'  'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2' 'faac')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-  	--enable-gpl \
-	--with-ffmpeg \
-	--with-x264 \
-	--without-doxygen
-	make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/community-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD
deleted file mode 100644
index 84455217a..000000000
--- a/community-testing/xmonad-contrib/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 49972 2011-06-22 19:52:11Z vegai $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: orbisvicis <gmail.com>
-
-pkgname=xmonad-contrib
-pkgver=0.9.2
-pkgrel=2.1
-pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.0.3-2' 'xmonad=0.9.2-2.1' 'sh' 'haskell-x11=1.5.0.0'
-         'haskell-x11-xft=0.3' 'haskell-utf8-string=0.3.6')
-install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('616cbc632bbde5cd4cdb643ee47e74d2')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
-}
diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install
deleted file mode 100644
index e9208c833..000000000
--- a/community-testing/xmonad-contrib/xmonad-contrib.install
+++ /dev/null
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD
deleted file mode 100644
index d669fc325..000000000
--- a/community-testing/xmonad/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: shild <shildv@gmail.com>
-
-pkgname=xmonad
-pkgver=0.9.2
-pkgrel=2.1
-pkgdesc="A lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
-install='xmonad.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-        xmonad.desktop xmonad.session xmonad.svg)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-#  runhaskell util/GenerateManpage.hs
-
-  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
-  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
-  install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session
-  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-}
-md5sums=('5a4117f798664d772d2a834ea6c90f1c'
-         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
-         '9d1bc84a7f32897d32f3fc71ef76228e'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
diff --git a/community-testing/xmonad/xmonad.desktop b/community-testing/xmonad/xmonad.desktop
deleted file mode 100644
index 0af0f2d9b..000000000
--- a/community-testing/xmonad/xmonad.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Xmonad GNOME
-Comment=Tiling window manager
-TryExec=/usr/bin/gnome-session
-Exec=gnome-session --session=xmonad
-Type=XSession
-Icon=/usr/share/pixmaps/xmonad.svg
diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install
deleted file mode 100644
index 6659247db..000000000
--- a/community-testing/xmonad/xmonad.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/xmonad.png b/community-testing/xmonad/xmonad.png
deleted file mode 100644
index d957f62f8..000000000
--- a/community-testing/xmonad/xmonad.png
+++ /dev/null
diff --git a/community-testing/xmonad/xmonad.session b/community-testing/xmonad/xmonad.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community-testing/xmonad/xmonad.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg
deleted file mode 100644
index 5fc884213..000000000
--- a/community-testing/xmonad/xmonad.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2211"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="47"
-   height="73"
-   version="1.0"
-   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2214" />
-  <sodipodi:namedview
-     inkscape:window-height="778"
-     inkscape:window-width="1278"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="23.5"
-     inkscape:cy="22.689137"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:current-layer="g3208" />
-  <g
-     id="g3208"
-     transform="translate(-44.517797,4.0967298)">
-    <g
-       id="g3212"
-       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
-      <path
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
-         id="text2220"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path3206"
-         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         sodipodi:nodetypes="ccccccccc" />
-    </g>
-    <path
-       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
-       id="text3216"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD
index ba7cc79c7..a49f6e751 100644
--- a/community/addresses/PKGBUILD
+++ b/community/addresses/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 44420 2011-04-07 13:06:35Z spupykin $
+# $Id: PKGBUILD 50653 2011-06-29 11:36:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=addresses
 pkgver=0.4.6
-pkgrel=6
+pkgrel=7
 pkgdesc="A versatile address book application for GNUstep"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://giesler.biz/bjoern/en/sw_addr.html"
 license=('LGPL')
-depends=('gnustep-back')
-source=(http://giesler.biz/bjoern/downloads/Addresses-$pkgver.tar.gz)
+depends=('gnustep-back' 'gnustep-base' 'gnustep-gui')
+makedepends=('gnustep-make' 'gcc-objc')
+#source=(http://giesler.biz/bjoern/downloads/Addresses-$pkgver.tar.gz)
+source=(http://arch.p5n.pp.ru/~sergej/dl/Addresses-$pkgver.tar.gz)
 md5sums=('2d6b6bf9a1578a5b3a13cb0bd2c60fad')
 
 build() {
@@ -22,6 +24,11 @@ build() {
   export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH
 
   make
+}
+
+package() {
+  . /etc/profile.d/GNUstep.sh
+  cd $srcdir/Addresses-$pkgver
   make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install
 
   # buggy install scripts
diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index c2c4b64dc..51abeb437 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=courier-mta
 pkgver=0.66.1
-pkgrel=3
+pkgrel=4
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -110,18 +110,18 @@ package() {
   ###############################################################################
   # Arch Linux specific tweaks to make things easier for the user
   # create passwordfile for webadmin -> standard archwebadmin
-   sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile
-   yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password
+  sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile
+  yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password
   # arch specific scripts
-   install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta
-   install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta
+  install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta
+  install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta
   install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd
   install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
   install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d
   install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
-  install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
-  install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d
-  install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
+  install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd
+  install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl
+  install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild
    #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \
    # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache
   # bug http://bugs.archlinux.org/task/5154
diff --git a/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD b/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
index 44f806528..669408bb8 100644
--- a/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
+++ b/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 23521 2010-08-12 09:23:12Z spupykin $
+# $Id: PKGBUILD 50658 2011-06-29 11:37:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=cross-arm-wince-cegcc-gcc-base
 pkgver=0.59.1
-pkgrel=2
+pkgrel=3
 _prefix=/opt/cegcc
 pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
 arch=(i686 x86_64 'mips64el')
 license=(GPL)
 options=(!libtool)
 url="http://cegcc.sf.net"
-depends=('glibc' 'mpfr' 'cloog-ppl')
+depends=('glibc' 'mpfr' 'cloog')
 makedepends=(cross-arm-wince-cegcc-binutils)
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
+source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
 md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
 
 build() {
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index b77f01f24..bc5710cc4 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 17212 2010-05-21 21:40:37Z spupykin $
+# $Id: PKGBUILD 50638 2011-06-29 10:55:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
-pkgver=3.0.713
+pkgver=3.0.714
 pkgrel=1
 pkgdesc="Network statistics gatherer (packet sniffer)."
 url="http://dmr.ath.cx/net/darkstat/"
@@ -10,11 +10,15 @@ license=("GPL")
 arch=(i686 x86_64 'mips64el')
 depends=('libpcap' 'zlib')
 source=(http://dmr.ath.cx/net/darkstat/$pkgname-$pkgver.tar.bz2)
-md5sums=('3fd2a4ddb123ad11bb99f1094a6206d9')
+md5sums=('eef385fadc8dbb611d3d4c4d8fa94817')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd $startdir/src/$pkgname-$pkgver
   make DESTDIR=$startdir/pkg install
 }
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
deleted file mode 100644
index 1f88ecec8..000000000
--- a/community/dosbox/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $
-# Maintainer :
-# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=dosbox
-pkgver=0.74
-pkgrel=2
-pkgdesc="An emulator with builtin DOS for running DOS Games"
-arch=('i686' 'x86_64')
-url="http://dosbox.sourceforge.net/"
-license=('GPL')
-depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/gcc46.patch
-  sed -i 's/png_check_sig/png_sig_cmp/' configure 
-  ./configure   --prefix=/usr \
-    --sysconfdir=/etc/dosbox  
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install 
-
-
-  # install docs, make does not install them
-  install -d $pkgdir/usr/share/doc/$pkgname
-  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-  install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video
-
-  install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png 
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop 
-}
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '85169ca599028bee8e29e0b3b7b34dd8'
-         '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community/dosbox/dosbox.desktop b/community/dosbox/dosbox.desktop
deleted file mode 100644
index dbaf05ced..000000000
--- a/community/dosbox/dosbox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=dosbox Emulator
-GenericName=Emulator
-Comment=An emulator to run old DOS games
-Icon=dosbox
-Exec=dosbox
-Terminal=false
-Categories=Emulator;Application;
diff --git a/community/dosbox/dosbox.png b/community/dosbox/dosbox.png
deleted file mode 100644
index b8a917986..000000000
--- a/community/dosbox/dosbox.png
+++ /dev/null
diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch
deleted file mode 100644
index eae9ae63e..000000000
--- a/community/dosbox/gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
---- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
-+++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
- 
-+#include <stddef.h> //for offsetof
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif
diff --git a/community/exaile/PKGBUILD b/community/exaile/PKGBUILD
deleted file mode 100644
index ca7c959c7..000000000
--- a/community/exaile/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 40067 2011-02-19 20:19:46Z ebelanger $
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Benjamin Wild <benwild@gmx.de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=exaile
-pkgver=0.3.2.1
-pkgrel=1
-pkgdesc="A full-featured media player for GTK+"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.exaile.org"
-license=('GPL')
-depends=('python2' \
-	 'gstreamer0.10-python' \
-	 'gstreamer0.10-good-plugins' \
-	 'mutagen' \
-	 'dbus-python' \
-	 'pygtk>=2.10' \
-	 'librsvg')
-makedepends=('make' 'help2man')
-optdepends=('pycddb: CD metadata retrieval' \
-	    'hal: device autodetection' \
-	    'gstreamer0.10-bad-plugins: support for more formats' \
-	    'gstreamer0.10-ugly-plugins: support for more formats' \
-	    'gstreamer0.10-ffmpeg: support for more formats' \
-	    'python-sexy: UI enhancements')
-source=(https://www.launchpad.net/exaile/${pkgver%.*}/${pkgver}/+download/exaile-${pkgver}.tar.gz)
-md5sums=('7ecfa9e52a9f2882717b3483518b604b')
-sha1sums=('86e1451ab9e6f96077c9dfc59eea3d4dccb00cf0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-    # python2 fix
-    for file in $(find . -name Makefile -print) tools/generate-launcher; do
-        sed -i 's_python_python2_' $file
-    done
-    for file in plugins/*/*.py exaile.py; do
-        sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-        sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-    done
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-
-	# fix for clicking files with spaces in names from nautilus
-	sed -i "s#%u#%f#" "${pkgdir}/usr/share/applications/exaile.desktop"
-}
diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD
index ba403b46d..93cf19ab0 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.13 2007/06/19 02:12:51 Snowman Exp $
+# $Id: PKGBUILD 50643 2011-06-29 10:56:50Z spupykin $
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=gsql
 pkgver=0.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Integrated database development tool for GNOME"
 url="http://gsql.org/"
 license=('GPL')
@@ -15,7 +15,6 @@ install=gsql.install
 options=(!libtool)
 source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('8f3322a75390584729e84a8570e08bea')
-sha1sums=('cb4081a5e232e5eb14a22f94ae2293aca73b9837')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
new file mode 100644
index 000000000..044531434
--- /dev/null
+++ b/community/inn/PKGBUILD
@@ -0,0 +1,131 @@
+# $Id: PKGBUILD 44059 2011-04-01 20:32:01Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Edward Tjörnhammar <xhemi@cube2.se>
+# Contributor: Edward Tjörnhammar <xhemi@cube2.se>
+
+pkgname=inn
+pkgver=2.5.2
+pkgrel=6
+pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
+url="http://www.isc.org/software/inn/"
+arch=('i686' 'x86_64')
+license=("custom:INN")
+depends=('openssl' 'dovecot')
+makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl')
+optdepends=('perl' 'python2' 'libsasl')
+options=(emptydirs docs zipman)
+install=inn.install
+backup=(etc/inn/newsfeeds
+	etc/inn/incoming.conf
+	etc/inn/nnrpd.track
+	etc/inn/passwd.nntp
+	etc/inn/inn.conf
+	etc/inn/moderators
+	etc/inn/control.ctl
+	etc/inn/expire.ctl
+	etc/inn/nntpsend.ctl
+	etc/inn/innreport.conf
+	etc/inn/innwatch.ctl
+	etc/inn/distrib.pats
+	etc/inn/actsync.cfg
+	etc/inn/actsync.ign
+	etc/inn/motd.news
+	etc/inn/storage.conf
+	etc/inn/cycbuff.conf
+	etc/inn/buffindexed.conf
+	etc/inn/innfeed.conf
+	etc/inn/news2mail.cf
+	etc/inn/readers.conf
+	etc/inn/radius.conf
+	etc/inn/ovdb.conf
+	etc/inn/subscriptions
+	var/db/inn/active
+	var/db/inn/active.times
+	var/db/inn/history
+	var/db/inn/history.dir
+	var/db/inn/history.hash
+	var/db/inn/history.index
+	var/db/inn/newsgroups)
+source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
+	innd.rc
+	nnrpd.rc
+	innd.conf
+	nnrpd.conf
+	site.make.patch)
+md5sums=('a6e577dceb90d07501b96149508b974b'
+         '2ad5138dac7c7535278f73f30020d656'
+         'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
+         'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
+         'bb4bbe86ae52fbbf08b0f6f370dea052'
+         '960c800026ed6e03901cf0bafdfd53d8')
+
+build() {
+  cd $srcdir/inn-$pkgver
+
+  [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+	--includedir=/usr/include/inn \
+	--sbindir=/usr/sbin \
+	--with-libtool \
+	--with-gnu-id \
+	--with-db-dir=/var/db/inn \
+	--sysconfdir=/etc/inn \
+	--with-spool-dir=/var/spool/news \
+	--with-log-dir=/var/log/inn \
+	--with-run-dir=/var/run/inn \
+	--with-tmp-dir=/var/spool/inn/tmp \
+	--enable-largefiles \
+	--with-openssl=/usr \
+	--with-perl \
+	--with-python \
+	--with-sendmail=/usr/bin/msmtp \
+	--with-sasl=/usr \
+	--with-news-user=9 \
+	--with-news-group=13
+  # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database
+
+  cat >>confdefs.h <<EOF
+#undef RUNASUSER
+#define RUNASUSER "news"
+#undef RUNASGROUP
+#define RUNASGROUP "news"
+EOF
+  sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global
+  [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch
+  export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH
+
+  make
+}
+
+package() {
+  cd $srcdir/inn-$pkgver
+  export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH
+
+  make DESTDIR=$pkgdir install
+
+  mkdir -p $pkgdir/etc/{conf,rc}.d
+  install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd
+  install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd
+
+  install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd
+  install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd
+
+  cd $pkgdir/usr/lib
+  for i in lib*.a; do
+	gcc -shared -o ${i%%.a}.so.2.0.0 $i
+	for j in 2.0 2; do
+	    ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j
+	done
+  done
+
+  touch $pkgdir/var/db/inn/history{.dir,.hash,.index,}
+
+  mkdir -p $pkgdir/usr/share/doc/inn $pkgdir/usr/share/inn/
+  mv $pkgdir/usr/share/man/man3/list.3 $pkgdir/usr/share/man/man3/list-inn.3
+  mv $pkgdir/usr/doc/* $pkgdir/usr/share/doc/inn/
+  mv $pkgdir/usr/http/* $pkgdir/usr/share/inn/
+  mv $pkgdir/usr/bin/archive $pkgdir/usr/bin/archive.inn
+  rm -rf $pkgdir/usr/doc $pkgdir/usr/http $pkgdir/var/run
+  install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE
+  chown root:root $pkgdir/usr/bin/innbind
+  chmod 05555 $pkgdir/usr/bin/innbind
+}
diff --git a/community/inn/inn.install b/community/inn/inn.install
new file mode 100644
index 000000000..e4070870f
--- /dev/null
+++ b/community/inn/inn.install
@@ -0,0 +1,22 @@
+post_install() {
+	grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
+	grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
+
+	/usr/bin/makedbz -i -o 2>&- >&-
+	mkdir /var/log/news 2>&- >&-
+
+	chown news:news -R var/spool/news 2>&- >&-
+	chown news:news var/log/news 2>&- >&-
+	chown news:news -R var/db/inn 2>&- >&-
+
+	echo ""
+	echo "->"
+	echo "-> If this is a first-time installation, a minimal active file and"
+	echo "-> history database have been installed.  Do not forget to update"
+	echo "-> your cron entries and configure INN.  See INSTALL for more"
+	echo "-> information."
+	echo "->"
+	echo "-> The default user:group for inn is news:news"
+	echo "->"
+	echo ""
+}
diff --git a/community/inn/innd.conf b/community/inn/innd.conf
new file mode 100644
index 000000000..48f96ba5e
--- /dev/null
+++ b/community/inn/innd.conf
@@ -0,0 +1,2 @@
+NEWS_USER=news
+NEWS_GROUP=news
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
new file mode 100644
index 000000000..e88bd0c39
--- /dev/null
+++ b/community/inn/innd.rc
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd
+[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1;
+
+case "$1" in
+	start)
+		stat_busy "Starting InterNetNews"
+		[ -d /var/run/inn ] || mkdir -p /var/run/inn
+		su $NEWS_USER -c /usr/bin/rc.news 2>&- >&-
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			echo $! > /var/run/innd.pid
+			add_daemon innd
+			stat_done
+		fi
+
+	;;
+	stop)
+		stat_busy "Stopping InterNetNews"
+		su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&-
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm /var/run/innd.pid
+			rm_daemon innd
+			stat_done
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf
new file mode 100644
index 000000000..689a289ce
--- /dev/null
+++ b/community/inn/nnrpd.conf
@@ -0,0 +1,3 @@
+USE_SSL=1
+LISTEN_PORT=563
+NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf"
diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc
new file mode 100644
index 000000000..d7c902832
--- /dev/null
+++ b/community/inn/nnrpd.rc
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd
+[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1;
+
+PID=`pidof -o %PPID nnrpd`
+case "$1" in
+	start)
+		stat_busy "Starting InterNetNews Readers Daemon"
+		if [ ! -f /var/run/nnrpd.pid ]; then
+			stat_append ":: InterNetNews (innd) is not running"
+			stat_fail
+			exit 1
+		fi
+		
+		[ -d /var/run/inn ] || mkdir -p /var/run/inn
+		[ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&-
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			PID=`pidof -o %PPID nnrpd`
+			echo $PID > /var/run/nnrpd.pid
+			add_daemon nnrpd
+			stat_done
+		fi
+
+	;;
+	stop)
+		stat_busy "Stopping InterNetNews Readers Daemon"
+		[ ! -z "$PID" ] && kill $PID >&-
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm /var/run/nnrpd.pid
+			rm_daemon nnrpd
+			stat_done
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/inn/site.make.patch b/community/inn/site.make.patch
new file mode 100644
index 000000000..5af6e1162
--- /dev/null
+++ b/community/inn/site.make.patch
@@ -0,0 +1,32 @@
+--- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200
++++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200
+@@ -52,7 +52,6 @@
+ 
+ PATH_ACTIVE		= ${PATHDB}/active
+ PATH_ACTIVE_TIMES	= ${PATHDB}/active.times
+-PATH_HISTORY		= ${PATHDB}/history
+ PATH_NEWSGROUPS		= ${PATHDB}/newsgroups
+ 
+ ##  Scripts from above, plus site-specific config files.
+@@ -98,7 +97,7 @@
+ ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
+ 
+ SPECIAL		= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
+-		$D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
++		$D$(PATH_NEWSGROUPS)
+ 
+ ##  Get new versions of everything from samples directory.
+ all:		$(ALL) config
+@@ -143,12 +142,6 @@
+ 	chown $(RUNASUSER) $@
+ 	chgrp $(RUNASGROUP) $@
+ 	chmod $(FILEMODE) $@
+-$D$(PATH_HISTORY):
+-	touch $@
+-	chown $(RUNASUSER) $@
+-	chgrp $(RUNASGROUP) $@
+-	chmod $(FILEMODE) $@
+-	test -z "$D" && $(PATHBIN)/makedbz -i -o
+ 
+ bootstrap:
+ 
diff --git a/community/ircservices/PKGBUILD b/community/ircservices/PKGBUILD
index 86abfc4da..2fc014c87 100644
--- a/community/ircservices/PKGBUILD
+++ b/community/ircservices/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44173 2011-04-04 11:41:07Z spupykin $
+# $Id: PKGBUILD 50648 2011-06-29 10:57:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ircservices
-pkgver=5.1.23
-pkgrel=2
+pkgver=5.1.24
+pkgrel=1
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
 arch=(i686 x86_64 'mips64el')
 url="http://www.ircservices.za.net/"
@@ -13,26 +13,26 @@ depends=('glibc')
 makedepends=('patch')
 options=('!makeflags' 'emptydirs')
 install=ircservices.install
-source=(http://www.ircservices.za.net/download/ircservices-$pkgver.tar.gz
+#source=(http://www.ircservices.za.net/download/ircservices-$pkgver.tar.gz
+source=(http://achurch.org/services/tarballs/ircservices-$pkgver.tar.gz
 	path-patch.patch
 	ircservices)
-md5sums=('666351f44adf57effc310a7a5943c9a2'
+md5sums=('d4f531537aeed230026cf5560f221ecb'
          '7e4bbf6fb398323afc8e85656ec82c13'
          'd5d6409ab04b3a715f9adc29a4fb8a2d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   patch -Np0 <../path-patch.patch
-
   ./configure -prefix /usr
-
   sed -i 's#getline#xgetline#' lang/langcomp.c
   make
-
   sed -i "s#DATDEST=/usr/lib/ircservices#DATDEST=$pkgdir/usr/lib/ircservices#" ./Makefile.inc
   sed -i "s#BINDEST=/usr/sbin#BINDEST=$pkgdir/usr/sbin#" ./Makefile.inc
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
   install -d -m 0755 $pkgdir/usr/sbin
   install -d -m 0755 $pkgdir/usr/lib
   install -d -m 0755 $pkgdir/etc/ircd
diff --git a/community/kgraphviewer/PKGBUILD b/community/kgraphviewer/PKGBUILD
index 4667eb2a8..a083b91d0 100644
--- a/community/kgraphviewer/PKGBUILD
+++ b/community/kgraphviewer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 32581 2010-11-14 21:49:18Z andrea $
+# $Id: PKGBUILD 50630 2011-06-29 08:39:25Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kgraphviewer
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Graphviz dot graph file viewer for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://opendesktop.org/content/show.php?content=23999'
@@ -17,6 +17,7 @@ md5sums=('6cc548221d8a741d13929993615c00f3')
 
 build(){
   cd ${srcdir}
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -27,5 +28,6 @@ build(){
 
 package() {
   cd ${srcdir}/build
+
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 06b987033..acc4c2159 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 43112 2011-03-24 07:47:25Z spupykin $
+# $Id: PKGBUILD 50663 2011-06-29 11:38:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://gnunet.org/libextractor/"
 depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo')
+makedepends=('flac' 'poppler' 'exiv2' 'qt')
 optdepends=('flac'
 	    'poppler'
 	    'exiv2'
@@ -23,6 +24,10 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm ${pkgdir}/usr/share/info/dir
 }
diff --git a/community/libquicktime/PKGBUILD b/community/libquicktime/PKGBUILD
deleted file mode 100644
index f20549cca..000000000
--- a/community/libquicktime/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 43669 2011-03-28 20:04:14Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=libquicktime
-pkgver=1.2.2
-pkgrel=2
-pkgdesc="A library for reading and writing quicktime files."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://libquicktime.sourceforge.net/"
-depends=('gtk2'  'ffmpeg'  'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-  	--enable-gpl \
-	--with-ffmpeg \
-	--with-x264 \
-	--without-doxygen
-	make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/community/lilypond/lilypond-gcc45.patch b/community/lilypond/lilypond-gcc45.patch
deleted file mode 100644
index 6af391ff3..000000000
--- a/community/lilypond/lilypond-gcc45.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
-index 99fe982..6949458 100644
---- a/lily/spacing-spanner.cc
-+++ b/lily/spacing-spanner.cc
-@@ -38,8 +38,8 @@ Spacing_spanner::get_columns (Grob *me_grob)
-   vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
- 			     &Paper_column::less_than);  
-   
--  all = vector<Grob*>::vector<Grob*> (all.begin () + start,
--				      all.begin () + end + 1);
-+  all = vector<Grob*> (all.begin () + start,
-+		       all.begin () + end + 1);
-   return all;
- }
- 
--- 
diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD
deleted file mode 100644
index 3eed51d6d..000000000
--- a/community/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 49670 2011-06-19 06:56:40Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.7.3
-pkgrel=3
-pkgdesc="A library written in C that allows you to create and run audio and video streams."
-arch=('i686' 'x86_64')
-url="http://www.linphone.org"
-license=('GPL')
-depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
-         '7ee15689eed1adbdcf0ddab8fadca34a')
-options=('!libtool')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver/
-  patch -p2 -i "${srcdir}"/disable-v4l1.patch
-  ./configure --prefix=/usr --libexecdir=/usr/lib/mediastreamer/
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/community/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
- 
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
--	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/community/mime-editor/PKGBUILD b/community/mime-editor/PKGBUILD
deleted file mode 100644
index 8b7528ad6..000000000
--- a/community/mime-editor/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 27254 2010-09-18 22:01:47Z schuay $
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.dot.org>
-
-pkgname=mime-editor
-pkgver=0.6
-pkgrel=2
-pkgdesc='Shared-mime info database editor, useful for changing MIME-type info in rox applications'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://rox.sourceforge.net/mime_editor.html'
-license=('GPL2')
-depends=('pygtk' 'rox-lib' 'shared-mime-info')
-groups=('rox-desktop')
-source=("http://downloads.sourceforge.net/project/rox/MIME-Editor/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'mime-editor')
-md5sums=('bfa250d074b6a712c1fce936a5fcaae4'
-         '9438b0a8d591abd03099ac5961540d4a')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print) MIME-Editor/AppRun; do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done 
-
-  mkdir -p ${pkgdir}/usr/share
-
-  cp -rp MIME-Editor ${pkgdir}/usr/share
-
- # create a shellscript which is known in the PATH
-  install -D ${srcdir}/$pkgname ${pkgdir}/usr/bin/$pkgname
-}
diff --git a/community/mime-editor/mime-editor b/community/mime-editor/mime-editor
deleted file mode 100644
index 17e1acfca..000000000
--- a/community/mime-editor/mime-editor
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/share/MIME-Editor/AppRun "$@"
diff --git a/community/perl-data-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD
new file mode 100644
index 000000000..8fea1b8e4
--- /dev/null
+++ b/community/perl-data-dumper/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: AUR Perl <aurperl@juster.info>
+
+pkgname='perl-data-dumper'
+pkgver=2.131
+pkgrel=1
+pkgdesc="Convert data structure into perl code"
+arch=('i686' 'x86_64')
+license=('PerlArtistic' 'GPL')
+options=('!emptydirs')
+depends=('perl')
+makedepends=()
+url='http://search.cpan.org/dist/Data-Dumper'
+source=("http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Data-Dumper-$pkgver.tar.gz")
+md5sums=('653ac6576e6916446419ae4ba786073f')
+
+build() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+    cd "${srcdir}/Data-Dumper-$pkgver"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  cd "${srcdir}/Data-Dumper-$pkgver"
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test )
+}
+
+package() {
+  cd "${srcdir}/Data-Dumper-$pkgver"
+  make install
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+}
diff --git a/community/perl-gstreamer-interfaces/ChangeLog b/community/perl-gstreamer-interfaces/ChangeLog
deleted file mode 100644
index 5fa6b829c..000000000
--- a/community/perl-gstreamer-interfaces/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-04-28  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.04
-
-	* ChangeLog: added
diff --git a/community/perl-gstreamer/ChangeLog b/community/perl-gstreamer/ChangeLog
deleted file mode 100644
index adbbf82e5..000000000
--- a/community/perl-gstreamer/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2009-02-28  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.15
-
-2008-12-06  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.12
-
-2008-04-28  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.10
-
-	* ChangeLog: added
diff --git a/community/perl-gtk2-mozembed/missing-pixbuf.patch b/community/perl-gtk2-mozembed/missing-pixbuf.patch
deleted file mode 100644
index f78a683e3..000000000
--- a/community/perl-gtk2-mozembed/missing-pixbuf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf Gtk2-MozEmbed-0.08/Makefile.PL
---- Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf	2010-08-11 13:34:16.000000000 +0200
-+++ Gtk2-MozEmbed-0.08/Makefile.PL	2010-08-11 13:35:36.000000000 +0200
-@@ -54,6 +54,8 @@ my %pkgcfg = ExtUtils::PkgConfig->find(
- 	"firefox-gtkmozembed >= $build_reqs{'Firefox'}",
- 	"mozilla-firefox-gtkmozembed >= $build_reqs{'Firefox'}");
- 
-+my %pkgcfg_pixbuf = ExtUtils::PkgConfig->find("gdk-pixbuf-2.0");
-+
- mkdir 'build', 0777;
- 
- our @xs_files = <xs/*.xs>;
-@@ -73,8 +75,8 @@ ExtUtils::PkgConfig->write_version_macro
-   $pkg => "GTK_MOZ_EMBED",
- );
- 
--my $inc = $pkgcfg{cflags};
--my $libs = $pkgcfg{libs};
-+my $inc = $pkgcfg{cflags} ." ". $pkgcfg_pixbuf{cflags};
-+my $libs = $pkgcfg{libs} . " ". $pkgcfg_pixbuf{libs};
- 
- if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) {
- 	$inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=)
diff --git a/community/perl-gtk2-webkit/ChangeLog b/community/perl-gtk2-webkit/ChangeLog
deleted file mode 100644
index 9664112d0..000000000
--- a/community/perl-gtk2-webkit/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-2009-04-16  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Release bump: 2
-
-2009-02-28  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.04
-
-2008-12-01  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Release bump: 2
-
-	* PKGBUILD: fixed license (Artistic -> PerlArtistic)
-
-2008-12-01  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* PKGBUILD: moved to [community]
diff --git a/community/picard/picard.install b/community/picard/picard.install
deleted file mode 100644
index c0797237a..000000000
--- a/community/picard/picard.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD
index f762ea7d9..9c8c0296d 100644
--- a/community/python-gnutls/PKGBUILD
+++ b/community/python-gnutls/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50350 2011-06-28 14:23:59Z spupykin $
+# $Id: PKGBUILD 50668 2011-06-29 11:39:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: N3RD3X <n3rd3x@linuxmail.org>
 
 pkgname=python-gnutls
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
@@ -16,5 +16,6 @@ md5sums=('b02d29b47830bbd8aec0b13206c2800e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i "s|openpgp_\(privkey_sign_hash\)|\1|g" gnutls/library/functions.py
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD
index e05b51606..1358b0445 100644
--- a/community/qmc2/PKGBUILD
+++ b/community/qmc2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 44152 2011-04-04 10:32:15Z spupykin $
+# $Id: PKGBUILD 50714 2011-06-29 20:28:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
 
 pkgname=qmc2
-pkgver=0.2.b19
+pkgver=0.2.b20
 pkgrel=1
 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME."
 url="http://qmc2.arcadehits.net"
@@ -12,12 +12,16 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('qt' 'phonon' 'sdl' 'libxmu')
 makedepends=('rsync' 'mesa')
 source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2")
-md5sums=('b9cae829540066d21154e474b24ccc62')
+md5sums=('e868144815ff44a2146e839c2395c6d1')
 
 build() {
   cd "$srcdir/$pkgname"
   export CTIME=0
   make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
+}
+
+package() {
+  cd "$srcdir/$pkgname"
   make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
   mkdir -p $pkgdir/usr/share/{applications,pixmaps}
   install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
diff --git a/community/rtorrent/ncurses58.patch b/community/rtorrent/ncurses58.patch
deleted file mode 100644
index 0f742daad..000000000
--- a/community/rtorrent/ncurses58.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display/canvas.h	2011-03-01 14:56:25.000000000 +0800
-+++ src/display/canvasfix.h	2011-03-01 14:56:10.000000000 +0800
-@@ -48,7 +48,7 @@ class Canvas {
- public:
-   typedef std::vector<Attributes> attributes_list;
- 
--  Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+  Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
-     m_window(newwin(height, width, y, x)) {}
-   ~Canvas() { delwin(m_window); }
-\ No newline at end of file
diff --git a/community/rutilt/PKGBUILD b/community/rutilt/PKGBUILD
deleted file mode 100644
index e99fc4a7d..000000000
--- a/community/rutilt/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 1149 2009-08-12 22:31:02Z ibiru $
-# Maintainer: Giovanni Scafora <linuxmania@gmail.com>
-# Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com>
-
-pkgname=rutilt
-pkgver=0.18
-pkgrel=2
-pkgdesc="Gtk2 utility that helps you configure your wireless network devices"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://bonrom.cbbknet.com"
-license=('GPL2')
-depends=('gtk2' 'xdg-utils')
-makedepends=('wireless_tools')
-install=rutilt.install
-source=(http://bonrom.cbbknet.com/files/RutilTv0.18.tar.gz)
-md5sums=('c745af9fbadd3a843b6f8273b6eb71bd')
-
-build() {
-  cd ${startdir}/src/RutilTv${pkgver}
-  ./configure.sh --prefix=/usr
-  make || return 1
-  make DESTDIR="$startdir/pkg" install
-}
diff --git a/community/rutilt/rutilt.install b/community/rutilt/rutilt.install
deleted file mode 100644
index b8397905a..000000000
--- a/community/rutilt/rutilt.install
+++ /dev/null
@@ -1,24 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-
-cat << EOF
-
-==> Remember to install "dhclient" or customize the "set_ip.sh" to match
-==> your needs, don't forget that it is executed with root privileges.
-==> Note: rutilt 0.16 doesn't read the old configs, so you have to
-==> recreate/rename it.
-
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
diff --git a/community/solfege/solfege.desktop b/community/solfege/solfege.desktop
deleted file mode 100644
index 10c62089c..000000000
--- a/community/solfege/solfege.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=GNU Solfege
-Exec=solfege
-Terminal=false
-Type=Application
-Icon=solfege
-Categories=Audio;Music;Education;
diff --git a/community/solfege/solfege.install b/community/solfege/solfege.install
deleted file mode 100644
index 003382003..000000000
--- a/community/solfege/solfege.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "==> To get sound out of MIDI-based components like Rhythm:"
-  echo
-  echo "Preferences > Sound Setup > Use external MIDI player"
-  echo
-  echo "==> And make sure you have timidity++ installed and configured,"
-  echo "==> otherwise you need a capable hardware MIDI player to use"
-  echo "==> the ALSA/OSS MIDI devices."
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community/synbak/PKGBUILD b/community/synbak/PKGBUILD
deleted file mode 100644
index 846821f11..000000000
--- a/community/synbak/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 24902 2010-08-29 17:21:27Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: aeolist <aeolist@hotmail.com>
-
-pkgname=synbak
-pkgver=1.3.2
-pkgrel=1
-pkgdesc='Meant to unify several backup methods in a single application while supplying a powerful reporting system'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.initzero.it/products/opensource/synbak'
-license=('GPL')
-depends=('bc' 'gnu-netcat')
-changelog=$pkgname.changelog
-source=(http://www.initzero.it/products/opensource/${pkgname}/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('72212d57f4fa2675e3ced19936784a51')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/synbak/synbak.changelog b/community/synbak/synbak.changelog
deleted file mode 100644
index 757f1a45c..000000000
--- a/community/synbak/synbak.changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-	* synbak 1.3.2-1
-	* upstream release
-
-2009-11-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-	* synbak 1.2.2-1
-	* upstream release
diff --git a/community/thunar-thumbnailers/PKGBUILD b/community/thunar-thumbnailers/PKGBUILD
deleted file mode 100755
index 62b423784..000000000
--- a/community/thunar-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 35176 2010-12-16 23:26:22Z andrea $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil@gmail.com
-
-pkgname=thunar-thumbnailers
-pkgver=0.4.1
-pkgrel=3
-pkgdesc="The thunar-thumbnailers project provides additional thumbnailers for Thunar, that also cover less common file formats"
-url="http://goodies.xfce.org/projects/thunar-plugins/thunar-thumbnailers/"
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-groups=('xfce4-goodies')
-depends=('imagemagick' 'ffmpegthumbnailer')
-optdepends=('raw-thumbnailer: support for Raw Digital Camera Images'
-	'dcraw: support for Raw Digital Camera Image')
-makedepends=('raw-thumbnailer' 'dcraw' 'unzip')
-options=('!libtool')
-install=thunar-thumbnailers.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('041b8aa0576e15491661741d1868547f')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr --enable-ffmpeg --enable-raw \
-		--libexecdir=/usr/lib/xfce4
-
-	make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-}
diff --git a/community/thunar-thumbnailers/thunar-thumbnailers.install b/community/thunar-thumbnailers/thunar-thumbnailers.install
deleted file mode 100644
index b62faf707..000000000
--- a/community/thunar-thumbnailers/thunar-thumbnailers.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-cat << _EOF
-==> important installation notes:
-    ----------------------------------------
-    After installing it is necessary to run:
-    /usr/lib/thunar-vfs-update-thumbnailers-cache-1
-    as a user to regenerate the cache of thumbnailers.
-    You may also need to log out and back in for the new
-    thumbnailers to work.
-_EOF
-
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/community/tripwire/ChangeLog b/community/tripwire/ChangeLog
deleted file mode 100644
index 9fd3b124d..000000000
--- a/community/tripwire/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2009-05-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#13766 fixed
-
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-	* Built for x86_64
diff --git a/community/tripwire/PKGBUILD b/community/tripwire/PKGBUILD
deleted file mode 100644
index 0f1d7030d..000000000
--- a/community/tripwire/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 14337 2010-04-02 23:17:36Z foutrelis $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: eliott <eliott@cactuswax.net>
-
-pkgname=tripwire
-pkgver=2.4.1.2
-pkgrel=2
-pkgdesc="An intrusion detection system."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/tripwire/"
-license=('GPL')
-depends=('openssl')
-backup=('etc/tripwire/twpol.txt' 'etc/tripwire/twcfg.txt')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \
-        twpol.txt twcfg.txt)
-
-md5sums=('8a1147c278b528ed593023912c4b649a'
-         '82900de7500bf6a6f90d8b9f20c4ee44'
-	 '4b44d8179e247a638ee2752543405753')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver-src
-
-#build package
-  ./configure --prefix=/usr --sysconfdir=/etc/tripwire
-  make || return 1
-
-  # This package doesn't have a typical make install, so we do it by hand.
-  #make DESTDIR=${pkgdir} install || return 1
- 
-#create var/lib directories
-  install -d ${pkgdir}/var/lib || return 1
-  install -d -m700 ${pkgdir}/var/lib/tripwire || return 1
-  install -d -m700 ${pkgdir}/var/lib/tripwire/report || return 1
-
-#install binaries
-  install -d ${pkgdir}/usr/sbin || return 1
-  install -m755 bin/siggen ${pkgdir}/usr/sbin/ || return 1
-  install -m755 bin/tripwire ${pkgdir}/usr/sbin/ || return 1
-  install -m755 bin/twadmin ${pkgdir}/usr/sbin/ || return 1
-  install -m755 bin/twprint ${pkgdir}/usr/sbin/ || return 1
-
-#copy install files for use by user after install, and fix a path
-  install -d ${pkgdir}/usr/share/$pkgname || return 1
-  install -m755 install/install.sh ${pkgdir}/usr/share/$pkgname/ || return 1
-  install -m644 install/install.cfg ${pkgdir}/usr/share/$pkgname/ || return 1
-  sed -i 's#./install/install.cfg#./install.cfg#' ${pkgdir}/usr/share/$pkgname/install.sh || return 1
-
-#install man pages - FS#13766 fixed
-  install -d ${pkgdir}/usr/share/man/{man4,man5,man8} || return 1
-  install -m644 man/man4/*.4 ${pkgdir}/usr/share/man/man4/ || return 1
-  install -m644 man/man5/*.5 ${pkgdir}/usr/share/man/man5/ || return 1
-  install -m644 man/man8/*.8 ${pkgdir}/usr/share/man/man8/ || return 1
-
-#install configuration files
-  install -d ${pkgdir}/etc/$pkgname || return 1
-  install -m644 ${srcdir}/twpol.txt ${pkgdir}/etc/tripwire/twpol.txt || return 1
-  install -m644 ${srcdir}/twcfg.txt ${pkgdir}/etc/tripwire/twcfg.txt || return 1
-}
diff --git a/community/tripwire/tripwire.install b/community/tripwire/tripwire.install
deleted file mode 100644
index 6eb5fd71d..000000000
--- a/community/tripwire/tripwire.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-/bin/cat <<END
-After installing this package, edit /usr/share/tripwire/install.sh and
-/usr/share/tripwire/install.cfg to your liking, run install.sh to
-generate cryptographic keys, and run tripwire --init to initialize the
-database.
-END
-}
diff --git a/community/tripwire/twcfg.txt b/community/tripwire/twcfg.txt
deleted file mode 100644
index d4392be0b..000000000
--- a/community/tripwire/twcfg.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ROOT                   =/usr/sbin
-POLFILE                =/etc/tripwire/tw.pol
-DBFILE                 =/var/lib/tripwire/$(HOSTNAME).twd
-REPORTFILE             =/var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr
-SITEKEYFILE            =/etc/tripwire/site.key
-LOCALKEYFILE           =/etc/tripwire/$(HOSTNAME)-local.key
-EDITOR                 =/usr/bin/vi
-LATEPROMPTING          =false
-LOOSEDIRECTORYCHECKING =false
-MAILNOVIOLATIONS       =true
-EMAILREPORTLEVEL       =3
-REPORTLEVEL            =3
-MAILMETHOD             =SENDMAIL
-SYSLOGREPORTING        =false
-MAILPROGRAM            =/usr/sbin/sendmail -oi -t
diff --git a/community/tripwire/twpol.txt b/community/tripwire/twpol.txt
deleted file mode 100644
index 051804889..000000000
--- a/community/tripwire/twpol.txt
+++ /dev/null
@@ -1,1093 +0,0 @@
-  ##############################################################################
- #                                                                            ##
-############################################################################## #
-#                                                                            # #
-# This is the example Tripwire Policy file.  It is intended as a place to    # #
-# start creating your own custom Tripwire Policy file.  Referring to it as   # #
-# well as the Tripwire Policy Guide should give you enough information to    # #
-# make a good custom Tripwire Policy file that better covers your            # #
-# configuration and security needs.  A text version of this policy file is   # #
-# called twpol.txt.                                                          # #
-#                                                                            # #
-# Note that this file is tuned to an 'everything' install of Red Hat Linux.  # #
-# If run unmodified, this file should create no errors on database           # #
-# creation, or violations on a subsiquent integrity check.  However, it is   # #
-# impossible for there to be one policy file for all machines, so this       # #
-# existing one errs on the side of security.  Your Linux configuration will  # #
-# most likey differ from the one our policy file was tuned to, and will      # #
-# therefore require some editing of the default Tripwire Policy file.        # #
-#                                                                            # #
-# The example policy file is best run with 'Loose Directory Checking'        # #
-# enabled. Set LOOSEDIRECTORYCHECKING=TRUE in the Tripwire Configuration     # #
-# file.                                                                      # #
-#                                                                            # #
-# Email support is not included and must be added to this file.              # #
-# Add the 'emailto=' to the rule directive section of each rule (add a comma # #
-# after the 'severity=' line and add an 'emailto=' and include the email     # #
-# addresses you want the violation reports to go to).  Addresses are         # #
-# semi-colon delimited.                                                      # #
-#                                                                            ##
-##############################################################################
-
-
-
-  ##############################################################################
- #                                                                            ##
-############################################################################## #
-#                                                                            # #
-# Global Variable Definitions                                                # #
-#                                                                            # #
-# These are defined at install time by the installation script.  You may     # #
-# Manually edit these if you are using this file directly and not from the   # #
-# installation script itself.                                                # #
-#                                                                            ##
-##############################################################################
-
-@@section GLOBAL
-TWROOT=/usr/sbin;
-TWBIN=/usr/sbin;
-TWPOL="/etc/tripwire";
-TWDB="/var/lib/tripwire";
-TWSKEY="/etc/tripwire";
-TWLKEY="/etc/tripwire";
-TWREPORT="/var/lib/tripwire/report";
-HOSTNAME=localhost;
-
-@@section FS
-SEC_CRIT      = $(IgnoreNone)-SHa ;  # Critical files that cannot change
-SEC_SUID      = $(IgnoreNone)-SHa ;  # Binaries with the SUID or SGID flags set
-SEC_BIN       = $(ReadOnly) ;        # Binaries that should not change
-SEC_CONFIG    = $(Dynamic) ;         # Config files that are changed infrequently but accessed often
-SEC_LOG       = $(Growing) ;         # Files that grow, but that should never change ownership
-SEC_INVARIANT = +tpug ;              # Directories that should never change permission or ownership
-SIG_LOW       = 33 ;                 # Non-critical files that are of minimal security impact
-SIG_MED       = 66 ;                 # Non-critical files that are of significant security impact
-SIG_HI        = 100 ;                # Critical files that are significant points of vulnerability
-
-
-# Tripwire Binaries
-(
-  rulename = "Tripwire Binaries",
-  severity = $(SIG_HI)
-)
-{
-  $(TWBIN)/siggen                      -> $(SEC_BIN) ;
-  $(TWBIN)/tripwire                    -> $(SEC_BIN) ;
-  $(TWBIN)/twadmin                     -> $(SEC_BIN) ;
-  $(TWBIN)/twprint                     -> $(SEC_BIN) ;
-}
-
-# Tripwire Data Files - Configuration Files, Policy Files, Keys, Reports, Databases
-(
-  rulename = "Tripwire Data Files",
-  severity = $(SIG_HI)
-)
-{
-  # NOTE: We remove the inode attribute because when Tripwire creates a backup,
-  # it does so by renaming the old file and creating a new one (which will
-  # have a new inode number).  Inode is left turned on for keys, which shouldn't
-  # ever change.
-
-  # NOTE: The first integrity check triggers this rule and each integrity check
-  # afterward triggers this rule until a database update is run, since the
-  # database file does not exist before that point.
-
-  $(TWDB)                              -> $(SEC_CONFIG) -i ;
-  $(TWPOL)/tw.pol                      -> $(SEC_BIN) -i ;
-  $(TWPOL)/tw.cfg                      -> $(SEC_BIN) -i ;
-  $(TWLKEY)/$(HOSTNAME)-local.key      -> $(SEC_BIN) ;
-  $(TWSKEY)/site.key                   -> $(SEC_BIN) ;
-
-  #don't scan the individual reports
-  $(TWREPORT)                          -> $(SEC_CONFIG) (recurse=0) ;
-}
-
-
-# Tripwire HQ Connector Binaries
-#(
-#  rulename = "Tripwire HQ Connector Binaries",
-#  severity = $(SIG_HI)
-#)
-#{
-#  $(TWBIN)/hqagent                     -> $(SEC_BIN) ;
-#}
-#
-# Tripwire HQ Connector - Configuration Files, Keys, and Logs
-
-  ##############################################################################
- #                                                                            ##
-############################################################################## #
-#                                                                            # #
-# Note: File locations here are different than in a stock HQ Connector       # #
-# installation.  This is because Tripwire 2.3 uses a different path          # #
-# structure than Tripwire 2.2.1.                                             # #
-#                                                                            # #
-# You may need to update your HQ Agent configuation file (or this policy     # #
-# file) to correct the paths.  We have attempted to support the FHS standard # #
-# here by placing the HQ Agent files similarly to the way Tripwire 2.3       # #
-# places them.                                                               # #
-#                                                                            ##
-##############################################################################
-
-#(
-#  rulename = "Tripwire HQ Connector Data Files",
-#  severity = $(SIG_HI)
-#)
-#{
-#   #############################################################################
-#  ##############################################################################
-#  # NOTE: Removing the inode attribute because when Tripwire creates a backup ##
-#  # it does so by renaming the old file and creating a new one (which will    ##
-#  # have a new inode number).  Leaving inode turned on for keys, which        ##
-#  # shouldn't ever change.                                                    ##
-#  #############################################################################
-#
-#  $(TWBIN)/agent.cfg                   -> $(SEC_BIN) -i ;
-#  $(TWLKEY)/authentication.key         -> $(SEC_BIN) ;
-#  $(TWDB)/tasks.dat                    -> $(SEC_CONFIG) ;
-#  $(TWDB)/schedule.dat                 -> $(SEC_CONFIG) ;
-#
-#  # Uncomment if you have agent logging enabled.
-#  #/var/log/tripwire/agent.log      -> $(SEC_LOG) ;
-#}
-
-
-
-# Commonly accessed directories that should remain static with regards to owner and group
-(
-  rulename = "Invariant Directories",
-  severity = $(SIG_MED)
-)
-{
-  /                                    -> $(SEC_INVARIANT) (recurse = 0) ;
-  /home                                -> $(SEC_INVARIANT) (recurse = 0) ;
-  /etc                                 -> $(SEC_INVARIANT) (recurse = 0) ;
-}
-  ################################################
- #                                              ##
-################################################ #
-#                                              # #
-# File System and Disk Administration Programs # #
-#                                              ##
-################################################
-
-(
-  rulename = "File System and Disk Administraton Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/accton                         -> $(SEC_CRIT) ;
-  /sbin/badblocks                      -> $(SEC_CRIT) ;
-  /sbin/busybox                        -> $(SEC_CRIT) ;
-  /sbin/busybox.anaconda               -> $(SEC_CRIT) ;
-  /sbin/convertquota                   -> $(SEC_CRIT) ;
-  /sbin/dosfsck                        -> $(SEC_CRIT) ;
-  /sbin/debugfs                        -> $(SEC_CRIT) ;
-  /sbin/debugreiserfs                  -> $(SEC_CRIT) ;
-  /sbin/dumpe2fs                       -> $(SEC_CRIT) ;
-  /sbin/dump                           -> $(SEC_CRIT) ;
-  /sbin/dump.static                    -> $(SEC_CRIT) ;
-  # /sbin/e2fsadm                        -> $(SEC_CRIT) ; tune2fs?
-  /sbin/e2fsck                         -> $(SEC_CRIT) ;
-  /sbin/e2label                        -> $(SEC_CRIT) ;
-  /sbin/fdisk                          -> $(SEC_CRIT) ;
-  /sbin/fsck                           -> $(SEC_CRIT) ;
-  /sbin/fsck.ext2                      -> $(SEC_CRIT) ;
-  /sbin/fsck.ext3                      -> $(SEC_CRIT) ;
-  /sbin/fsck.minix                     -> $(SEC_CRIT) ;
-  /sbin/fsck.msdos                     -> $(SEC_CRIT) ;
-  /sbin/fsck.vfat                      -> $(SEC_CRIT) ;
-  /sbin/ftl_check                      -> $(SEC_CRIT) ;
-  /sbin/ftl_format                     -> $(SEC_CRIT) ;
-  /sbin/hdparm                         -> $(SEC_CRIT) ;
-  #/sbin/lvchange                       -> $(SEC_CRIT) ;
-  #/sbin/lvcreate                       -> $(SEC_CRIT) ;
-  #/sbin/lvdisplay                      -> $(SEC_CRIT) ;
-  #/sbin/lvextend                       -> $(SEC_CRIT) ;
-  #/sbin/lvmchange                      -> $(SEC_CRIT) ;
-  #/sbin/lvmcreate_initrd               -> $(SEC_CRIT) ;
-  #/sbin/lvmdiskscan                    -> $(SEC_CRIT) ;
-  #/sbin/lvmsadc                        -> $(SEC_CRIT) ;
-  #/sbin/lvmsar                         -> $(SEC_CRIT) ;
-  #/sbin/lvreduce                       -> $(SEC_CRIT) ;
-  #/sbin/lvremove                       -> $(SEC_CRIT) ;
-  #/sbin/lvrename                       -> $(SEC_CRIT) ;
-  #/sbin/lvscan                         -> $(SEC_CRIT) ;
-  /sbin/mkbootdisk                     -> $(SEC_CRIT) ;
-  /sbin/mkdosfs                        -> $(SEC_CRIT) ;
-  /sbin/mke2fs                         -> $(SEC_CRIT) ;
-  /sbin/mkfs                           -> $(SEC_CRIT) ;
-  /sbin/mkfs.bfs                       -> $(SEC_CRIT) ;
-  /sbin/mkfs.ext2                      -> $(SEC_CRIT) ;
-  /sbin/mkfs.minix                     -> $(SEC_CRIT) ;
-  /sbin/mkfs.msdos                     -> $(SEC_CRIT) ;
-  /sbin/mkfs.vfat                      -> $(SEC_CRIT) ;
-  /sbin/mkinitrd                       -> $(SEC_CRIT) ;
-  #/sbin/mkpv                         -> $(SEC_CRIT) ;
-  /sbin/mkraid                         -> $(SEC_CRIT) ;
-  /sbin/mkreiserfs                     -> $(SEC_CRIT) ;
-  /sbin/mkswap                         -> $(SEC_CRIT) ;
-  #/sbin/mtx                            -> $(SEC_CRIT) ;
-  /sbin/pam_console_apply              -> $(SEC_CRIT) ;
-  /sbin/parted                         -> $(SEC_CRIT) ;
-  /sbin/pcinitrd                       -> $(SEC_CRIT) ;
-  #/sbin/pvchange                       -> $(SEC_CRIT) ;
-  #/sbin/pvcreate                       -> $(SEC_CRIT) ;
-  #/sbin/pvdata                         -> $(SEC_CRIT) ;
-  #/sbin/pvdisplay                      -> $(SEC_CRIT) ;
-  #/sbin/pvmove                         -> $(SEC_CRIT) ;
-  #/sbin/pvscan                         -> $(SEC_CRIT) ;
-  /sbin/quotacheck                     -> $(SEC_CRIT) ;
-  /sbin/quotaon                        -> $(SEC_CRIT) ;
-  /sbin/raidstart                      -> $(SEC_CRIT) ;
-  /sbin/reiserfsck                     -> $(SEC_CRIT) ;
-  /sbin/resize2fs                      -> $(SEC_CRIT) ;
-  /sbin/resize_reiserfs                -> $(SEC_CRIT) ;
-  /sbin/restore                        -> $(SEC_CRIT) ;
-  /sbin/restore.static                 -> $(SEC_CRIT) ;
-  /sbin/scsi_info                      -> $(SEC_CRIT) ;
-  /sbin/sfdisk                         -> $(SEC_CRIT) ;
-  /sbin/stinit                         -> $(SEC_CRIT) ;
-  #/sbin/tapeinfo                       -> $(SEC_CRIT) ;
-  /sbin/tune2fs                        -> $(SEC_CRIT) ;
-  /sbin/unpack                         -> $(SEC_CRIT) ;
-  /sbin/update                         -> $(SEC_CRIT) ;
-  #/sbin/vgcfgbackup                    -> $(SEC_CRIT) ;
-  #/sbin/vgcfgrestore                   -> $(SEC_CRIT) ;
-  #/sbin/vgchange                       -> $(SEC_CRIT) ;
-  #/sbin/vgck                           -> $(SEC_CRIT) ;
-  #/sbin/vgcreate                       -> $(SEC_CRIT) ;
-  #/sbin/vgdisplay                      -> $(SEC_CRIT) ;
-  #/sbin/vgexport                       -> $(SEC_CRIT) ;
-  #/sbin/vgextend                       -> $(SEC_CRIT) ;
-  #/sbin/vgimport                       -> $(SEC_CRIT) ;
-  #/sbin/vgmerge                        -> $(SEC_CRIT) ;
-  #/sbin/vgmknodes                      -> $(SEC_CRIT) ;
-  #/sbin/vgreduce                       -> $(SEC_CRIT) ;
-  #/sbin/vgremove                       -> $(SEC_CRIT) ;
-  #/sbin/vgrename                       -> $(SEC_CRIT) ;
-  #/sbin/vgscan                         -> $(SEC_CRIT) ;
-  #/sbin/vgsplit                        -> $(SEC_CRIT) ;
-  /bin/chgrp                           -> $(SEC_CRIT) ;
-  /bin/chmod                           -> $(SEC_CRIT) ;
-  /bin/chown                           -> $(SEC_CRIT) ;
-  /bin/cp                              -> $(SEC_CRIT) ;
-  /bin/cpio                            -> $(SEC_CRIT) ;
-  /bin/mount                           -> $(SEC_CRIT) ;
-  /bin/umount                          -> $(SEC_CRIT) ;
-  /bin/mkdir                           -> $(SEC_CRIT) ;
-  /bin/mknod                           -> $(SEC_CRIT) ;
-  /bin/mktemp                          -> $(SEC_CRIT) ;
-  /bin/rm                              -> $(SEC_CRIT) ;
-  /bin/rmdir                           -> $(SEC_CRIT) ;
-  /bin/touch                           -> $(SEC_CRIT) ;
-}
-
-  ##################################
- #                                ##
-################################## #
-#                                # #
-# Kernel Administration Programs # #
-#                                ##
-##################################
-
-(
-  rulename = "Kernel Administration Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/adjtimex                       -> $(SEC_CRIT) ;
-  /sbin/ctrlaltdel                     -> $(SEC_CRIT) ;
-  /sbin/depmod                         -> $(SEC_CRIT) ;
-  /sbin/insmod                         -> $(SEC_CRIT) ;
-  /sbin/insmod.static                  -> $(SEC_CRIT) ;
-  /sbin/insmod_ksymoops_clean          -> $(SEC_CRIT) ;
-  /sbin/klogd                          -> $(SEC_CRIT) ;
-  /sbin/ldconfig                       -> $(SEC_CRIT) ;
-  /sbin/minilogd                       -> $(SEC_CRIT) ;
-  /sbin/modinfo                        -> $(SEC_CRIT) ;
-  #/sbin/nuactlun                       -> $(SEC_CRIT) ;
-  #/sbin/nuscsitcpd                     -> $(SEC_CRIT) ;
-  /sbin/pivot_root                     -> $(SEC_CRIT) ;
-  /sbin/sndconfig                      -> $(SEC_CRIT) ;
-  /sbin/sysctl                         -> $(SEC_CRIT) ;
-}
-
-  #######################
- #                     ##
-####################### #
-#                     # #
-# Networking Programs # #
-#                     ##
-#######################
-
-(
-  rulename = "Networking Programs",
-  severity = $(SIG_HI)
-)
-{
-  /etc/sysconfig/network-scripts/ifdown                  -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-cipcb            -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-ippp             -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-ipv6             -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-isdn             -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-post             -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-ppp              -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-sit              -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifdown-sl               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup                    -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-aliases            -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-cipcb              -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-ippp               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-ipv6               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-isdn               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-plip               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-plusb              -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-post               -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-ppp                -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-routes             -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-sit                -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-sl                 -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/ifup-wireless           -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/network-functions       -> $(SEC_CRIT) ;
-  /etc/sysconfig/network-scripts/network-functions-ipv6  -> $(SEC_CRIT) ;
-  /bin/ping                            -> $(SEC_CRIT) ;
-  /sbin/agetty                         -> $(SEC_CRIT) ;
-  /sbin/arp                            -> $(SEC_CRIT) ;
-  /sbin/arping                         -> $(SEC_CRIT) ;
-  /sbin/dhcpcd                         -> $(SEC_CRIT) ;
-  /sbin/ether-wake                     -> $(SEC_CRIT) ;
-  #/sbin/getty                          -> $(SEC_CRIT) ;
-  /sbin/ifcfg                          -> $(SEC_CRIT) ;
-  /sbin/ifconfig                       -> $(SEC_CRIT) ;
-  /sbin/ifdown                         -> $(SEC_CRIT) ;
-  /sbin/ifenslave                      -> $(SEC_CRIT) ;
-  /sbin/ifport                         -> $(SEC_CRIT) ;
-  /sbin/ifup                           -> $(SEC_CRIT) ;
-  /sbin/ifuser                         -> $(SEC_CRIT) ;
-  /sbin/ip                             -> $(SEC_CRIT) ;
-  /sbin/ip6tables                      -> $(SEC_CRIT) ;
-  /sbin/ipchains                       -> $(SEC_CRIT) ;
-  /sbin/ipchains-restore               -> $(SEC_CRIT) ;
-  /sbin/ipchains-save                  -> $(SEC_CRIT) ;
-  /sbin/ipfwadm                        -> $(SEC_CRIT) ;
-  /sbin/ipmaddr                        -> $(SEC_CRIT) ;
-  /sbin/iptables                       -> $(SEC_CRIT) ;
-  /sbin/iptables-restore               -> $(SEC_CRIT) ;
-  /sbin/iptables-save                  -> $(SEC_CRIT) ;
-  /sbin/iptunnel                       -> $(SEC_CRIT) ;
-  /sbin/ipvsadm                        -> $(SEC_CRIT) ;
-  /sbin/ipvsadm-restore                -> $(SEC_CRIT) ;
-  /sbin/ipvsadm-save                   -> $(SEC_CRIT) ;
-  /sbin/ipx_configure                  -> $(SEC_CRIT) ;
-  /sbin/ipx_interface                  -> $(SEC_CRIT) ;
-  /sbin/ipx_internal_net               -> $(SEC_CRIT) ;
-  /sbin/iwconfig                       -> $(SEC_CRIT) ;
-  /sbin/iwgetid                        -> $(SEC_CRIT) ;
-  /sbin/iwlist                         -> $(SEC_CRIT) ;
-  /sbin/iwpriv                         -> $(SEC_CRIT) ;
-  /sbin/iwspy                          -> $(SEC_CRIT) ;
-  /sbin/mgetty                         -> $(SEC_CRIT) ;
-  /sbin/mingetty                       -> $(SEC_CRIT) ;
-  /sbin/nameif                         -> $(SEC_CRIT) ;
-  /sbin/netreport                      -> $(SEC_CRIT) ;
-  /sbin/plipconfig                     -> $(SEC_CRIT) ;
-  /sbin/portmap                        -> $(SEC_CRIT) ;
-  /sbin/ppp-watch                      -> $(SEC_CRIT) ;
-  #/sbin/rarp                           -> $(SEC_CRIT) ;
-  /sbin/route                          -> $(SEC_CRIT) ;
-  /sbin/slattach                       -> $(SEC_CRIT) ;
-  /sbin/tc                             -> $(SEC_CRIT) ;
-  #/sbin/uugetty                        -> $(SEC_CRIT) ;
-  /sbin/vgetty                         -> $(SEC_CRIT) ;
-  /sbin/ypbind                         -> $(SEC_CRIT) ;
-}
-
-  ##################################
- #                                ##
-################################## #
-#                                # #
-# System Administration Programs # #
-#                                ##
-##################################
-
-(
-  rulename = "System Administration Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/chkconfig                      -> $(SEC_CRIT) ;
-  /sbin/fuser                          -> $(SEC_CRIT) ;
-  /sbin/halt                           -> $(SEC_CRIT) ;
-  /sbin/init                           -> $(SEC_CRIT) ;
-  /sbin/initlog                        -> $(SEC_CRIT) ;
-  /sbin/install-info                   -> $(SEC_CRIT) ;
-  /sbin/killall5                       -> $(SEC_CRIT) ;
-  #/sbin/linuxconf                      -> $(SEC_CRIT) ;
-  #/sbin/linuxconf-auth                 -> $(SEC_CRIT) ;
-  /sbin/pam_tally                      -> $(SEC_CRIT) ;
-  /sbin/pwdb_chkpwd                    -> $(SEC_CRIT) ;
-  #/sbin/remadmin                       -> $(SEC_CRIT) ;
-  /sbin/rescuept                       -> $(SEC_CRIT) ;
-  /sbin/rmt                            -> $(SEC_CRIT) ;
-  /sbin/rpc.lockd                      -> $(SEC_CRIT) ;
-  /sbin/rpc.statd                      -> $(SEC_CRIT) ;
-  /sbin/rpcdebug                       -> $(SEC_CRIT) ;
-  /sbin/service                        -> $(SEC_CRIT) ;
-  /sbin/setsysfont                     -> $(SEC_CRIT) ;
-  /sbin/shutdown                       -> $(SEC_CRIT) ;
-  /sbin/sulogin                        -> $(SEC_CRIT) ;
-  /sbin/swapon                         -> $(SEC_CRIT) ;
-  /sbin/syslogd                        -> $(SEC_CRIT) ;
-  /sbin/unix_chkpwd                    -> $(SEC_CRIT) ;
-  /bin/pwd                             -> $(SEC_CRIT) ;
-  /bin/uname                           -> $(SEC_CRIT) ;
-}
-
-  ########################################
- #                                      ##
-######################################## #
-#                                      # #
-# Hardware and Device Control Programs # #
-#                                      ##
-########################################
-(
-  rulename = "Hardware and Device Control Programs",
-  severity = $(SIG_HI)
-)
-{
-  /bin/setserial                       -> $(SEC_CRIT) ;
-  /bin/sfxload                         -> $(SEC_CRIT) ;
-  /sbin/blockdev                       -> $(SEC_CRIT) ;
-  /sbin/cardctl                        -> $(SEC_CRIT) ;
-  /sbin/cardmgr                        -> $(SEC_CRIT) ;
-  /sbin/cbq                            -> $(SEC_CRIT) ;
-  /sbin/dump_cis                       -> $(SEC_CRIT) ;
-  /sbin/elvtune                        -> $(SEC_CRIT) ;
-  /sbin/hotplug                        -> $(SEC_CRIT) ;
-  /sbin/hwclock                        -> $(SEC_CRIT) ;
-  /sbin/ide_info                       -> $(SEC_CRIT) ;
-  #/sbin/isapnp                         -> $(SEC_CRIT) ;
-  #/sbin/kbdrate                        -> $(SEC_CRIT) ;
-  /sbin/losetup                        -> $(SEC_CRIT) ;
-  /sbin/lspci                          -> $(SEC_CRIT) ;
-  /sbin/lspnp                          -> $(SEC_CRIT) ;
-  /sbin/mii-tool                       -> $(SEC_CRIT) ;
-  /sbin/pack_cis                       -> $(SEC_CRIT) ;
-  #/sbin/pnpdump                        -> $(SEC_CRIT) ;
-  /sbin/probe                          -> $(SEC_CRIT) ;
-  #/sbin/pump                           -> $(SEC_CRIT) ;
-  /sbin/setpci                         -> $(SEC_CRIT) ;
-  /sbin/shapecfg                       -> $(SEC_CRIT) ;
-}
-
-  ###############################
- #                             ##
-############################### #
-#                             # #
-# System Information Programs # #
-#                             ##
-###############################
-(
-  rulename = "System Information Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/consoletype                    -> $(SEC_CRIT) ;
-  /sbin/kernelversion                  -> $(SEC_CRIT) ;
-  /sbin/runlevel                       -> $(SEC_CRIT) ;
-}
-
-  ####################################
- #                                  ##
-#################################### #
-#                                  # #
-# Application Information Programs # #
-#                                  ##
-####################################
-
-(
-  rulename = "Application Information Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/genksyms                       -> $(SEC_CRIT) ;
-  #/sbin/genksyms.old                   -> $(SEC_CRIT) ;
-  /sbin/rtmon                          -> $(SEC_CRIT) ;
-}
-
-  ##########################
- #                        ##
-########################## #
-#                        # #
-# Shell Related Programs # #
-#                        ##
-##########################
-(
-  rulename = "Shell Related Programs",
-  severity = $(SIG_HI)
-)
-{
-  /sbin/getkey                         -> $(SEC_CRIT) ;
-  /sbin/nash                           -> $(SEC_CRIT) ;
-  /sbin/sash                           -> $(SEC_CRIT) ;
-}
-
-
-  ################
- #              ##
-################ #
-#              # #
-# OS Utilities # #
-#              ##
-################
-(
-  rulename = "Operating System Utilities",
-  severity = $(SIG_HI)
-)
-{
-  /bin/arch                            -> $(SEC_CRIT) ;
-  /bin/ash                             -> $(SEC_CRIT) ;
-  /bin/ash.static                      -> $(SEC_CRIT) ;
-  /bin/aumix-minimal                   -> $(SEC_CRIT) ;
-  /bin/basename                        -> $(SEC_CRIT) ;
-  /bin/cat                             -> $(SEC_CRIT) ;
-  #/bin/consolechars                    -> $(SEC_CRIT) ;
-  /bin/cut                             -> $(SEC_CRIT) ;
-  /bin/date                            -> $(SEC_CRIT) ;
-  /bin/dd                              -> $(SEC_CRIT) ;
-  /bin/df                              -> $(SEC_CRIT) ;
-  /bin/dmesg                           -> $(SEC_CRIT) ;
-  /bin/doexec                          -> $(SEC_CRIT) ;
-  /bin/echo                            -> $(SEC_CRIT) ;
-  /bin/ed                              -> $(SEC_CRIT) ;
-  /bin/egrep                           -> $(SEC_CRIT) ;
-  /bin/false                           -> $(SEC_CRIT) ;
-  /bin/fgrep                           -> $(SEC_CRIT) ;
-  /bin/gawk                            -> $(SEC_CRIT) ;
-  /bin/gawk-3.1.0                      -> $(SEC_CRIT) ;
-  /bin/gettext                         -> $(SEC_CRIT) ;
-  /bin/grep                            -> $(SEC_CRIT) ;
-  /bin/gunzip                          -> $(SEC_CRIT) ;
-  /bin/gzip                            -> $(SEC_CRIT) ;
-  /bin/hostname                        -> $(SEC_CRIT) ;
-  /bin/igawk                           -> $(SEC_CRIT) ;
-  /bin/ipcalc                          -> $(SEC_CRIT) ;
-  /bin/kill                            -> $(SEC_CRIT) ;
-  /bin/ln                              -> $(SEC_CRIT) ;
-  /bin/loadkeys                        -> $(SEC_CRIT) ;
-  /bin/login                           -> $(SEC_CRIT) ;
-  /bin/ls                              -> $(SEC_CRIT) ;
-  /bin/mail                            -> $(SEC_CRIT) ;
-  /bin/more                            -> $(SEC_CRIT) ;
-  /bin/mt                              -> $(SEC_CRIT) ;
-  /bin/mv                              -> $(SEC_CRIT) ;
-  /bin/netstat                         -> $(SEC_CRIT) ;
-  /bin/nice                            -> $(SEC_CRIT) ;
-  /bin/pgawk                           -> $(SEC_CRIT) ;
-  /bin/ps                              -> $(SEC_CRIT) ;
-  /bin/rpm                             -> $(SEC_CRIT) ;
-  /bin/sed                             -> $(SEC_CRIT) ;
-  /bin/sleep                           -> $(SEC_CRIT) ;
-  /bin/sort                            -> $(SEC_CRIT) ;
-  /bin/stty                            -> $(SEC_CRIT) ;
-  /bin/su                              -> $(SEC_CRIT) ;
-  /bin/sync                            -> $(SEC_CRIT) ;
-  /bin/tar                             -> $(SEC_CRIT) ;
-  /bin/true                            -> $(SEC_CRIT) ;
-  /bin/usleep                          -> $(SEC_CRIT) ;
-  /bin/vi                              -> $(SEC_CRIT) ;
-  /bin/zcat                            -> $(SEC_CRIT) ;
-  /bin/zsh                             -> $(SEC_CRIT) ;
-  /bin/zsh-4.0.2                       -> $(SEC_CRIT) ;
-  /sbin/sln                            -> $(SEC_CRIT) ;
-  /usr/bin/vimtutor                    -> $(SEC_CRIT) ;
-}
-
-  ##############################
- #                            ##
-############################## #
-#                            # #
-# Critical Utility Sym-Links # #
-#                            ##
-##############################
-(
-  rulename = "Critical Utility Sym-Links",
-  severity = $(SIG_HI)
-)
-{
-  #/sbin/askrunlevel                    -> $(SEC_CRIT) ;
-  /sbin/clock                          -> $(SEC_CRIT) ;
-  #/sbin/fixperm                        -> $(SEC_CRIT) ;
-  /sbin/fsck.reiserfs                  -> $(SEC_CRIT) ;
-  #/sbin/fsconf                         -> $(SEC_CRIT) ;
-  /sbin/ipfwadm-wrapper                -> $(SEC_CRIT) ;
-  /sbin/kallsyms                       -> $(SEC_CRIT) ;
-  /sbin/ksyms                          -> $(SEC_CRIT) ;
-  /sbin/lsmod                          -> $(SEC_CRIT) ;
-  #/sbin/mailconf                       -> $(SEC_CRIT) ;
-  /sbin/mkfs.reiserfs                  -> $(SEC_CRIT) ;
-  #/sbin/modemconf                      -> $(SEC_CRIT) ;
-  /sbin/modprobe                       -> $(SEC_CRIT) ;
-  /sbin/mount.ncp                      -> $(SEC_CRIT) ;
-  /sbin/mount.ncpfs                    -> $(SEC_CRIT) ;
-  /sbin/mount.smb                      -> $(SEC_CRIT) ;
-  /sbin/mount.smbfs                    -> $(SEC_CRIT) ;
-  #/sbin/netconf                        -> $(SEC_CRIT) ;
-  /sbin/pidof                          -> $(SEC_CRIT) ;
-  /sbin/poweroff                       -> $(SEC_CRIT) ;
-  /sbin/quotaoff                       -> $(SEC_CRIT) ;
-  /sbin/raid0run                       -> $(SEC_CRIT) ;
-  /sbin/raidhotadd                     -> $(SEC_CRIT) ;
-  /sbin/raidhotgenerateerror           -> $(SEC_CRIT) ;
-  /sbin/raidhotremove                  -> $(SEC_CRIT) ;
-  /sbin/raidstop                       -> $(SEC_CRIT) ;
-  /sbin/rdump                          -> $(SEC_CRIT) ;
-  /sbin/rdump.static                   -> $(SEC_CRIT) ;
-  /sbin/reboot                         -> $(SEC_CRIT) ;
-  /sbin/rmmod                          -> $(SEC_CRIT) ;
-  /sbin/rrestore                       -> $(SEC_CRIT) ;
-  /sbin/rrestore.static                -> $(SEC_CRIT) ;
-  /sbin/swapoff                        -> $(SEC_CRIT) ;
-  /sbin/telinit                        -> $(SEC_CRIT) ;
-  #/sbin/userconf                       -> $(SEC_CRIT) ;
-  #/sbin/uucpconf                       -> $(SEC_CRIT) ;
-  #/sbin/vregistry                      -> $(SEC_CRIT) ;
-  /bin/awk                             -> $(SEC_CRIT) ;
-  /bin/bash2                           -> $(SEC_CRIT) ;
-  /bin/bsh                             -> $(SEC_CRIT) ;
-  /bin/csh                             -> $(SEC_CRIT) ;
-  /bin/dnsdomainname                   -> $(SEC_CRIT) ;
-  /bin/domainname                      -> $(SEC_CRIT) ;
-  /bin/ex                              -> $(SEC_CRIT) ;
-  /bin/gtar                            -> $(SEC_CRIT) ;
-  /bin/nisdomainname                   -> $(SEC_CRIT) ;
-  /bin/red                             -> $(SEC_CRIT) ;
-  /bin/rvi                             -> $(SEC_CRIT) ;
-  /bin/rview                           -> $(SEC_CRIT) ;
-  /bin/view                            -> $(SEC_CRIT) ;
-  /bin/ypdomainname                    -> $(SEC_CRIT) ;
-}
-
-
-  #########################
- #                       ##
-######################### #
-#                       # #
-# Temporary directories # #
-#                       ##
-#########################
-(
-  rulename = "Temporary directories",
-  recurse = false,
-  severity = $(SIG_LOW)
-)
-{
-  /usr/tmp                             -> $(SEC_INVARIANT) ;
-  /var/tmp                             -> $(SEC_INVARIANT) ;
-  /tmp                                 -> $(SEC_INVARIANT) ;
-}
-
-  ###############
- #             ##
-############### #
-#             # #
-# Local files # #
-#             ##
-###############
-(
-  rulename = "User binaries",
-  severity = $(SIG_MED)
-)
-{
-  /sbin                                -> $(SEC_BIN) (recurse = 1) ;
-  /usr/bin                             -> $(SEC_BIN) (recurse = 1) ;
-  /usr/sbin                            -> $(SEC_BIN) (recurse = 1) ;
-  /usr/local/bin                       -> $(SEC_BIN) (recurse = 1) ;
-}
-
-(
-  rulename = "Shell Binaries",
-  severity = $(SIG_HI)
-)
-{
-  /bin/bash                            -> $(SEC_BIN) ;
-  /bin/ksh                             -> $(SEC_BIN) ;
-  # /bin/psh                             -> $(SEC_BIN) ; # No longer used?
-  # /bin/Rsh                             -> $(SEC_BIN) ; # No longer used?
-  /bin/sh                              -> $(SEC_BIN) ;
-  # /bin/shell                           -> $(SEC_SUID) ; # No longer used?
-  # /bin/tsh                             -> $(SEC_BIN) ; # No longer used?
-  /bin/tcsh                            -> $(SEC_BIN) ;
-  /sbin/nologin                        -> $(SEC_BIN) ;
-}
-
-(
-  rulename = "Security Control",
-  severity = $(SIG_HI)
-)
-{
-  /etc/group                           -> $(SEC_CRIT) ;
-  /etc/security                        -> $(SEC_CRIT) ;
-  #/var/spool/cron/crontabs             -> $(SEC_CRIT) ; # Uncomment when this file exists
-}
-
-#(
-#  rulename = "Boot Scripts",
-#  severity = $(SIG_HI)
-#)
-#{
-#  /etc/rc                              -> $(SEC_CONFIG) ;
-#  /etc/rc.bsdnet                       -> $(SEC_CONFIG) ;
-#  /etc/rc.dt                           -> $(SEC_CONFIG) ;
-#  /etc/rc.net                          -> $(SEC_CONFIG) ;
-#  /etc/rc.net.serial                   -> $(SEC_CONFIG) ;
-#  /etc/rc.nfs                          -> $(SEC_CONFIG) ;
-#  /etc/rc.powerfail                    -> $(SEC_CONFIG) ;
-#  /etc/rc.tcpip                        -> $(SEC_CONFIG) ;
-#  /etc/trcfmt.Z                        -> $(SEC_CONFIG) ;
-#}
-
-(
-  rulename = "Login Scripts",
-  severity = $(SIG_HI)
-)
-{
-  /etc/bashrc                          -> $(SEC_CONFIG) ;
-  /etc/csh.cshrc                       -> $(SEC_CONFIG) ;
-  /etc/csh.login                       -> $(SEC_CONFIG) ;
-  /etc/inputrc                         -> $(SEC_CONFIG) ;
-  # /etc/tsh_profile                     -> $(SEC_CONFIG) ; #Uncomment when this file exists
-  /etc/profile                         -> $(SEC_CONFIG) ;
-}
-
-# Libraries
-(
-  rulename = "Libraries",
-  severity = $(SIG_MED)
-)
-{
-  /usr/lib                             -> $(SEC_BIN) ;
-  /usr/local/lib                       -> $(SEC_BIN) ;
-}
-
-
-  ######################################################
- #                                                    ##
-###################################################### #
-#                                                    # #
-# Critical System Boot Files                         # #
-# These files are critical to a correct system boot. # #
-#                                                    ##
-######################################################
-
-(
-  rulename = "Critical system boot files",
-  severity = $(SIG_HI)
-)
-{
-     /boot                             -> $(SEC_CRIT) ;
-     #/sbin/devfsd                      -> $(SEC_CRIT) ;
-     /sbin/grub                        -> $(SEC_CRIT) ;
-     /sbin/grub-install                -> $(SEC_CRIT) ;
-     /sbin/grub-md5-crypt              -> $(SEC_CRIT) ;
-     /sbin/installkernel               -> $(SEC_CRIT) ;
-     /sbin/lilo                        -> $(SEC_CRIT) ;
-     /sbin/mkkerneldoth                -> $(SEC_CRIT) ;
-     !/boot/System.map ;
-     !/boot/module-info ;
-     /usr/share/grub/i386-redhat/e2fs_stage1_5      -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/fat_stage1_5       -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/ffs_stage1_5       -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/minix_stage1_5     -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/reiserfs_stage1_5  -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/stage1             -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/stage2             -> $(SEC_CRIT) ;
-     /usr/share/grub/i386-redhat/vstafs_stage1_5    -> $(SEC_CRIT) ;
-     # other boot files may exist.  Look for:
-     #/ufsboot                          -> $(SEC_CRIT) ;
-}
-   ##################################################
-  ###################################################
-  # These files change every time the system boots ##
-  ##################################################
-(
-  rulename = "System boot changes",
-  severity = $(SIG_HI)
-)
-{
-     !/var/run/ftp.pids-all ; # Comes and goes on reboot.
-     !/root/.enlightenment ;
-     /dev/log                          -> $(SEC_CONFIG) ;
-     /dev/cua0                         -> $(SEC_CONFIG) ;
-     # /dev/printer                      -> $(SEC_CONFIG) ; # Uncomment if you have a printer device
-     /dev/console                      -> $(SEC_CONFIG) -u ; # User ID may change on console login/logout.
-     /dev/tty1                         -> $(SEC_CONFIG) ; # tty devices
-     /dev/tty2                         -> $(SEC_CONFIG) ; # tty devices
-     /dev/tty3                         -> $(SEC_CONFIG) ; # are extremely
-     /dev/tty4                         -> $(SEC_CONFIG) ; # variable
-     /dev/tty5                         -> $(SEC_CONFIG) ;
-     /dev/tty6                         -> $(SEC_CONFIG) ;
-     /dev/urandom                      -> $(SEC_CONFIG) ;
-     /dev/initctl                      -> $(SEC_CONFIG) ;
-     /var/lock/subsys                  -> $(SEC_CONFIG) ;
-     /var/lock/subsys/amd              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/anacron          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/apmd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/arpwatch         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/atd              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/autofs           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/bcm5820          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/bgpd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/bootparamd       -> $(SEC_CONFIG) ;
-     /var/lock/subsys/canna            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/crond            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/cWnn             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/dhcpd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/firewall         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/freeWnn          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/gated            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/gpm              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/httpd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/identd           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/innd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ipchains         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/iptables         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ipvsadm          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/irda             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/iscsi            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/isdn             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/junkbuster       -> $(SEC_CONFIG) ;
-     /var/lock/subsys/kadmin           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/keytable         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/kprop            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/krb524           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/krb5kdc          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/kudzu            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/kWnn             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ldap             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/linuxconf        -> $(SEC_CONFIG) ;
-     /var/lock/subsys/lpd              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/mars_nwe         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/mcserv           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/mysqld           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/named            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/netfs            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/network          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/nfs              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/nfslock          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/nscd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ntpd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ospf6d           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ospfd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/pcmcia           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/portmap          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/postgresql       -> $(SEC_CONFIG) ;
-     /var/lock/subsys/pxe              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/radvd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/random           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rarpd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/reconfig         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rhnsd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ripd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ripngd           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/routed           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rstatd           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rusersd          -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rwalld           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/rwhod            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/sendmail         -> $(SEC_CONFIG) ;
-     /var/lock/subsys/smb              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/snmpd            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/squid            -> $(SEC_CONFIG) ;
-     /var/lock/subsys/sshd             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/syslog           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/tux              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/tWnn             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ups              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/vncserver        -> $(SEC_CONFIG) ;
-     /var/lock/subsys/wine             -> $(SEC_CONFIG) ;
-     /var/lock/subsys/xfs              -> $(SEC_CONFIG) ;
-     /var/lock/subsys/xinetd           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ypbind           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/yppasswdd        -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ypserv           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/ypxfrd           -> $(SEC_CONFIG) ;
-     /var/lock/subsys/zebra            -> $(SEC_CONFIG) ;
-     /var/run                          -> $(SEC_CONFIG) ;
-     /var/log                          -> $(SEC_CONFIG) ;
-     /etc/ioctl.save                   -> $(SEC_CONFIG) ;
-     /etc/issue.net                    -> $(SEC_CONFIG) -i ; # Inode number changes
-     /etc/issue                        -> $(SEC_CONFIG) ;
-     /etc/mtab                         -> $(SEC_CONFIG) -i ; # Inode number changes on any mount/unmount
-     /lib/modules                      -> $(SEC_CONFIG) ;
-     /etc/.pwd.lock                    -> $(SEC_CONFIG) ;
-     # /lib/modules/preferred            -> $(SEC_CONFIG) ; #Uncomment when this file exists
-}
-
-# These files change the behavior of the root account
-(
-  rulename = "Root config files",
-  severity = 100
-)
-{
-     /root                             -> $(SEC_CRIT) ; # Catch all additions to /root
-     /root/.Xresources                 -> $(SEC_CONFIG) ;
-     /root/.bashrc                     -> $(SEC_CONFIG) ;
-     /root/.bash_profile               -> $(SEC_CONFIG) ;
-     /root/.bash_logout                -> $(SEC_CONFIG) ;
-     /root/.cshrc                      -> $(SEC_CONFIG) ;
-     /root/.tcshrc                     -> $(SEC_CONFIG) ;
-     #/root/Mail                        -> $(SEC_CONFIG) ;
-     #/root/mail                        -> $(SEC_CONFIG) ;
-     #/root/.amandahosts                -> $(SEC_CONFIG) ;
-     #/root/.addressbook.lu             -> $(SEC_CONFIG) ;
-     #/root/.addressbook                -> $(SEC_CONFIG) ;
-     /root/.bash_history               -> $(SEC_CONFIG) ;
-     #/root/.elm                        -> $(SEC_CONFIG) ;
-     /root/.esd_auth                   -> $(SEC_CONFIG) ;
-     /root/.gnome_private              -> $(SEC_CONFIG) ;
-     /root/.gnome-desktop              -> $(SEC_CONFIG) ;
-     /root/.gnome                      -> $(SEC_CONFIG) ;
-     /root/.ICEauthority               -> $(SEC_CONFIG) ;
-     #/root/.mc                         -> $(SEC_CONFIG) ;
-     #/root/.pinerc                     -> $(SEC_CONFIG) ;
-     #/root/.sawfish                    -> $(SEC_CONFIG) ;
-     /root/.Xauthority                 -> $(SEC_CONFIG) -i ; # Changes Inode number on login
-     #/root/.xauth                      -> $(SEC_CONFIG) ;
-     #/root/.xsession-errors            -> $(SEC_CONFIG) ;
-}
-
-  ################################
- #                              ##
-################################ #
-#                              # #
-# Critical configuration files # #
-#                              ##
-################################
-(
-  rulename = "Critical configuration files",
-  severity = $(SIG_HI)
-)
-{
-     #/etc/conf.linuxconf               -> $(SEC_BIN) ;
-     /etc/crontab                      -> $(SEC_BIN) ;
-     /etc/cron.hourly                  -> $(SEC_BIN) ;
-     /etc/cron.daily                   -> $(SEC_BIN) ;
-     /etc/cron.weekly                  -> $(SEC_BIN) ;
-     /etc/cron.monthly                 -> $(SEC_BIN) ;
-     /etc/default                      -> $(SEC_BIN) ;
-     /etc/fstab                        -> $(SEC_BIN) ;
-     /etc/exports                      -> $(SEC_BIN) ;
-     /etc/group-                       -> $(SEC_BIN) ;  # changes should be infrequent
-     /etc/host.conf                    -> $(SEC_BIN) ;
-     /etc/hosts.allow                  -> $(SEC_BIN) ;
-     /etc/hosts.deny                   -> $(SEC_BIN) ;
-     /etc/httpd/conf                   -> $(SEC_BIN) ;  # changes should be infrequent
-     /etc/protocols                    -> $(SEC_BIN) ;
-     /etc/services                     -> $(SEC_BIN) ;
-     /etc/rc.d/init.d                  -> $(SEC_BIN) ;
-     /etc/rc.d                         -> $(SEC_BIN) ;
-     /etc/mail.rc                      -> $(SEC_BIN) ;
-     /etc/modules.conf                 -> $(SEC_BIN) ;
-     /etc/motd                         -> $(SEC_BIN) ;
-     /etc/named.conf                   -> $(SEC_BIN) ;
-     /etc/passwd                       -> $(SEC_CONFIG) ;
-     /etc/passwd-                      -> $(SEC_CONFIG) ;
-     /etc/profile.d                    -> $(SEC_BIN) ;
-     /var/lib/nfs/rmtab                -> $(SEC_BIN) ;
-     /usr/sbin/fixrmtab                -> $(SEC_BIN) ;
-     /etc/rpc                          -> $(SEC_BIN) ;
-     /etc/sysconfig                    -> $(SEC_BIN) ;
-     /etc/samba/smb.conf               -> $(SEC_CONFIG) ;
-     #/etc/gettydefs                    -> $(SEC_BIN) ;
-     /etc/nsswitch.conf                -> $(SEC_BIN) ;
-     /etc/yp.conf                      -> $(SEC_BIN) ;
-     /etc/hosts                        -> $(SEC_CONFIG) ;
-     /etc/xinetd.conf                  -> $(SEC_CONFIG) ;
-     /etc/inittab                      -> $(SEC_CONFIG) ;
-     /etc/resolv.conf                  -> $(SEC_CONFIG) ;
-     /etc/syslog.conf                  -> $(SEC_CONFIG) ;
-}
-
-  ####################
- #                  ##
-#################### #
-#                  # #
-# Critical devices # #
-#                  ##
-####################
-(
-  rulename = "Critical devices",
-  severity = $(SIG_HI),
-  recurse = false
-)
-{
-     /dev/kmem                         -> $(Device) ;
-     /dev/mem                          -> $(Device) ;
-     /dev/null                         -> $(Device) ;
-     /dev/zero                         -> $(Device) ;
-     /proc/devices                     -> $(Device) ;
-     /proc/net                         -> $(Device) ;
-     /proc/sys                         -> $(Device) ;
-     /proc/cpuinfo                     -> $(Device) ;
-     /proc/modules                     -> $(Device) ;
-     /proc/mounts                      -> $(Device) ;
-     /proc/dma                         -> $(Device) ;
-     /proc/filesystems                 -> $(Device) ;
-     /proc/pci                         -> $(Device) ;
-     /proc/interrupts                  -> $(Device) ;
-     /proc/driver/rtc                  -> $(Device) ;
-     /proc/ioports                     -> $(Device) ;
-     /proc/scsi                        -> $(Device) ;
-     /proc/kcore                       -> $(Device) ;
-     /proc/self                        -> $(Device) ;
-     /proc/kmsg                        -> $(Device) ;
-     /proc/stat                        -> $(Device) ;
-     /proc/ksyms                       -> $(Device) ;
-     /proc/loadavg                     -> $(Device) ;
-     /proc/uptime                      -> $(Device) ;
-     /proc/locks                       -> $(Device) ;
-     /proc/version                     -> $(Device) ;
-     /proc/mdstat                      -> $(Device) ;
-     /proc/meminfo                     -> $(Device) ;
-     /proc/cmdline                     -> $(Device) ;
-     /proc/misc                        -> $(Device) ;
-}
-
-# Rest of critical system binaries
-(
-  rulename = "OS executables and libraries",
-  severity = $(SIG_HI)
-)
-{
-     /bin                              -> $(SEC_BIN) ;
-     /lib                              -> $(SEC_BIN) ;
-}
-
-#=============================================================================
-#
-# Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire,
-# Inc. in the United States and other countries. All rights reserved.
-#
-# Linux is a registered trademark of Linus Torvalds.
-#
-# UNIX is a registered trademark of The Open Group.
-#
-#=============================================================================
-#
-# Permission is granted to make and distribute verbatim copies of this document
-# provided the copyright notice and this permission notice are preserved on all
-# copies.
-#
-# Permission is granted to copy and distribute modified versions of this
-# document under the conditions for verbatim copying, provided that the entire
-# resulting derived work is distributed under the terms of a permission notice
-# identical to this one.
-#
-# Permission is granted to copy and distribute translations of this document
-# into another language, under the above conditions for modified versions,
-# except that this permission notice may be stated in a translation approved by
-# Tripwire, Inc.
-#
-# DCM
diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD
index 0884301bf..f30a0faf0 100644
--- a/community/ude/PKGBUILD
+++ b/community/ude/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 46324 2011-05-05 10:17:03Z spupykin $
+# $Id: PKGBUILD 50701 2011-06-29 17:35:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=ude
 pkgver=0.2.10a
-pkgrel=1
+pkgrel=2
 pkgdesc="Unix Desktop Environment is a GUI desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libjpeg' 'libxmu' 'libxpm')
 url="http://udeproject.sourceforge.net/index.shtml"
-source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz \
+source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz
 	$pkgname.desktop)
 md5sums=('1370418179f56612ffe63d6ed0c89d13'
          '84f94253ea284258c4465cd76edf599f')
@@ -27,4 +27,5 @@ package() {
   mkdir -p $pkgdir/etc/X11/sessions
   make prefix=$pkgdir/usr install
   cp $srcdir/$pkgname.desktop $pkgdir/etc/X11/sessions
+  mv $pkgdir/usr/doc $pkgdir/usr/share/
 }
diff --git a/community/wifi-radar/PKGBUILD b/community/wifi-radar/PKGBUILD
deleted file mode 100644
index f0f41f2f5..000000000
--- a/community/wifi-radar/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 31375 2010-10-31 12:54:04Z lfleischer $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: dtw <dibble.at.thewrecker.dot.net>
-# Contributor: shawnifoley http://bbs.archlinux.org/viewtopic.php?t=11492
-# Contributor: sebastien le guillerm <geekitus@tele2.fr>
-
-pkgname=wifi-radar
-pkgver=2.0.s08
-pkgrel=2
-pkgdesc="A PyGTK2 utility for managing WiFi profiles"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://wifi-radar.berlios.de/"
-license=('GPL')
-depends=('pygtk' 'wireless_tools' 'sudo')
-backup=('etc/wifi-radar.conf')
-install=$pkgname.install
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('cbad24805d5dc6696e38dc1df619c819')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # python2 fix
-  sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' wifi-radar
-
-# Fix iwlist and iwconfig path
-  sed -i 's|/sbin/iwlist|/usr/sbin/iwlist|' $pkgname
-  sed -i 's|/sbin/iwconfig|/usr/sbin/iwconfig|' $pkgname
-
-  make || return 1
-  make DESTDIR=${pkgdir}/usr sysconfdir=${pkgdir}/etc install
-}
diff --git a/community/wifi-radar/wifi-radar.install b/community/wifi-radar/wifi-radar.install
deleted file mode 100644
index 91f62bd14..000000000
--- a/community/wifi-radar/wifi-radar.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_remove(){
-  rm etc/wifi-radar.conf &> /dev/null
-  rm var/log/wifi-radar.log &> /dev/null
-}
diff --git a/community/xmldiff/PKGBUILD b/community/xmldiff/PKGBUILD
new file mode 100644
index 000000000..167e91ec8
--- /dev/null
+++ b/community/xmldiff/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 50681 2011-06-29 12:57:42Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
+
+pkgname=xmldiff
+pkgver=0.6.10
+pkgrel=1
+pkgdesc="A python tool that figures out the differences between two similar XML files, in the same way the diff utility does it"
+arch=('i686' 'x86_64')
+url="http://www.logilab.org/project/xmldiff/"
+license=('GPL2')
+depends=('python2' 'libxslt' 'jade')
+optdepends=('docbook-xsl: render revision info')
+source=(http://ftp.logilab.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('a61e6e95a130e3bd53f5ea5616cc5314')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' main.py
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  install -m755 -d "$pkgdir/usr/share/man/man1"
+  install -m644 man/*.1 "$pkgdir/usr/share/man/man1"
+}
diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD
deleted file mode 100644
index db518bfbc..000000000
--- a/community/xulrunner-oss/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 114705 2011-03-15 15:11:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=xulrunner-oss
-pkgver=2.0.1
-_ffoxver=4.0.1
-pkgrel=2
-pkgdesc="Mozilla Runtime Environment compiled with OSS support"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libevent' 'sqlite3>=3.7.4' 'libnotify')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
-        mozconfig
-        mozilla-pkgconfig.patch
-        xulrunner-version.patch
-        xulrunner-omnijar.patch
-	port_gnomevfs_to_gio.patch
-	oss.patch)
-options=('!emptydirs')
-conflicts=('xulrunner')
-provides=("xulrunner=${pkgver}")
-md5sums=('9abda7d23151e97913c8555a64c13f34'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186'
-         'a0236f6c3e55f60b7888d8cf137ff209'
-         '0bf82bc6677e3ce57fd20a147fe8d7b1'
-         '42f83468b296452fb754a81a4317ca64'
-         '81032ce49c2a5ac15d62155bcc42d3ed')
-
-build() {
-  cd "${srcdir}/mozilla-2.0"
-  cp "${srcdir}/mozconfig" .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
-
-  #Force installation to the same path for every version
-  patch -Np1 -i "${srcdir}/xulrunner-version.patch"
-
-  patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
-
-  patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
-
-  patch -Np0 -i "${srcdir}/oss.patch"
-  sed -i 's/sydney_audio_alsa/sydney_audio_oss/' media/libsydneyaudio/src/Makefile.in
-  sed -i '/EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)/d' layout/build/Makefile.in
-  sed -i '/EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)/d' toolkit/library/libxul-config.mk
-
-  unset CFLAGS
-  unset CXXFLAGS
-  export CXXFLAGS="-fpermissive"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "${srcdir}/mozilla-2.0"
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  #Remove included dictionaries, add symlink to system myspell path.
-  #Note: this will cause file conflicts when users have installed dictionaries in the old location
-  rm -rf "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries"
-  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries"
-
-  # add xulrunner library path to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
-}
diff --git a/community/xulrunner-oss/mozconfig b/community/xulrunner-oss/mozconfig
deleted file mode 100644
index 03a352920..000000000
--- a/community/xulrunner-oss/mozconfig
+++ /dev/null
@@ -1,56 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
-ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-shared-js
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-xprint
-ac_add_options --disable-mochitest
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-gconf
-ac_add_options --enable-libnotify
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/community/xulrunner-oss/mozilla-pkgconfig.patch b/community/xulrunner-oss/mozilla-pkgconfig.patch
deleted file mode 100644
index 2203efcde..000000000
--- a/community/xulrunner-oss/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in	2011-03-13 03:25:12.350027359 -0700
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in
---- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/libxul.pc.in	2011-03-13 03:25:28.010027359 -0700
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
---- mozilla-2.0.orig/xulrunner/installer/Makefile.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/Makefile.in	2011-03-13 03:25:55.570027359 -0700
-@@ -121,6 +121,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-13 03:26:18.676694023 -0700
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-13 03:26:41.566694025 -0700
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in	2011-03-13 03:27:19.680027357 -0700
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/community/xulrunner-oss/oss.patch b/community/xulrunner-oss/oss.patch
deleted file mode 100644
index ca79879fd..000000000
--- a/community/xulrunner-oss/oss.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.in	2011-03-16 04:58:10.640027357 -0700
-+++ configure.in.orig	2011-03-16 04:58:39.313360691 -0700
-@@ -6266,20 +6266,6 @@
-     AC_DEFINE(MOZ_TREMOR)
- fi
- 
--dnl ========================================================
--dnl = Check alsa availability on Linux if using sydneyaudio
--dnl ========================================================
--
--dnl If using sydneyaudio with Linux, ensure that the alsa library is available
--if test -n "$MOZ_SYDNEYAUDIO"; then
--   case "$target_os" in
--linux*)
--      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
--         [echo "$MOZ_ALSA_PKG_ERRORS"
--          AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
--      ;;
--   esac
--fi
- 
- dnl ========================================================
- dnl Splashscreen
-@@ -9294,7 +9280,6 @@
- AC_SUBST(MOZ_TREMOR)
- AC_SUBST(MOZ_WEBM)
- AC_SUBST(MOZ_OGG)
--AC_SUBST(MOZ_ALSA_LIBS)
- AC_SUBST(VPX_AS)
- AC_SUBST(VPX_ASFLAGS)
- AC_SUBST(VPX_DASH_C_FLAG)
diff --git a/community/xulrunner-oss/port_gnomevfs_to_gio.patch b/community/xulrunner-oss/port_gnomevfs_to_gio.patch
deleted file mode 100644
index 797baff42..000000000
--- a/community/xulrunner-oss/port_gnomevfs_to_gio.patch
+++ /dev/null
@@ -1,1316 +0,0 @@
-diff -r 49a1b2aa43c5 extensions/gio/Makefile.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/extensions/gio/Makefile.in	Tue Jan 11 11:17:52 2011 +0100
-@@ -0,0 +1,69 @@
-+# vim:set ts=8 sw=8 sts=8 noet:
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Mozilla gnome-vfs extension.
-+#
-+# The Initial Developer of the Original Code is IBM Corporation.
-+#
-+# Portions created by IBM Corporation are Copyright (C) 2004
-+# IBM Corporation. All Rights Reserved.
-+#
-+# Contributor(s):
-+#   Darin Fisher <darin@meer.net>
-+#   Jan Horak <jhorak@redhat.com>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+DEPTH		= ../..
-+topsrcdir	= @top_srcdir@
-+srcdir		= @srcdir@
-+VPATH		= @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+MODULE		= nkgio
-+LIBRARY_NAME	= nkgio
-+SHORT_LIBNAME	= nkgio
-+IS_COMPONENT	= 1
-+
-+CPPSRCS		= \
-+		nsGIOProtocolHandler.cpp \
-+		$(NULL)
-+
-+LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
-+
-+EXTRA_DSO_LDOPTS = \
-+		   $(XPCOM_GLUE_LDOPTS) \
-+		   $(NSPR_LIBS) \
-+		   $(MOZ_GIO_LIBS) \
-+		   $(NULL)
-+
-+# make sure this component is never statically linked into the main
-+# application.  this is necessary since we don't want to force users
-+# to install gio in order to use the rest of mozilla ;-)
-+FORCE_SHARED_LIB= 1
-+
-+include $(topsrcdir)/config/rules.mk
-diff -r 49a1b2aa43c5 extensions/gio/makefiles.sh
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/extensions/gio/makefiles.sh	Tue Jan 11 11:17:52 2011 +0100
-@@ -0,0 +1,41 @@
-+#! /bin/sh
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is Mozilla Build System
-+#
-+# The Initial Developer of the Original Code is
-+# Ben Turner <mozilla@songbirdnest.com>
-+#
-+# Portions created by the Initial Developer are Copyright (C) 2007
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+add_makefiles "
-+  extensions/gio/Makefile
-+"
-diff -r 49a1b2aa43c5 extensions/gio/nsGIOProtocolHandler.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/extensions/gio/nsGIOProtocolHandler.cpp	Tue Jan 11 11:17:52 2011 +0100
-@@ -0,0 +1,1163 @@
-+/* vim:set ts=2 sw=2 et cindent: */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Mozilla gnome-vfs extension.
-+ *
-+ * The Initial Developer of the Original Code is IBM Corporation.
-+ *
-+ * Portions created by IBM Corporation are Copyright (C) 2004
-+ * IBM Corporation. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Darin Fisher <darin@meer.net>
-+ *   Jan Horak <jhorak@redhat.com>
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/*
-+ * This code is based on original Mozilla gnome-vfs extension. It implements
-+ * input stream provided by GVFS/GIO.
-+*/
-+#include "mozilla/ModuleUtils.h"
-+#include "nsIPrefService.h"
-+#include "nsIPrefBranch2.h"
-+#include "nsIObserver.h"
-+#include "nsThreadUtils.h"
-+#include "nsProxyRelease.h"
-+#include "nsIStringBundle.h"
-+#include "nsIStandardURL.h"
-+#include "nsMimeTypes.h"
-+#include "nsNetUtil.h"
-+#include "mozilla/Monitor.h"
-+#include <gio/gio.h>
-+
-+#define MOZ_GIO_SCHEME              "moz-gio"
-+#define MOZ_GIO_SUPPORTED_PROTOCOLS "network.gio.supported-protocols"
-+
-+//-----------------------------------------------------------------------------
-+
-+// NSPR_LOG_MODULES=gio:5
-+#ifdef PR_LOGGING
-+static PRLogModuleInfo *sGIOLog;
-+#define LOG(args) PR_LOG(sGIOLog, PR_LOG_DEBUG, args)
-+#else
-+#define LOG(args)
-+#endif
-+
-+
-+//-----------------------------------------------------------------------------
-+static nsresult
-+MapGIOResult(gint code) 
-+{
-+  switch (code)
-+  {
-+     case G_IO_ERROR_NOT_FOUND:                  return NS_ERROR_FILE_NOT_FOUND; // shows error
-+     case G_IO_ERROR_INVALID_ARGUMENT:           return NS_ERROR_INVALID_ARG;
-+     case G_IO_ERROR_NOT_SUPPORTED:              return NS_ERROR_NOT_AVAILABLE;
-+     case G_IO_ERROR_NO_SPACE:                   return NS_ERROR_FILE_NO_DEVICE_SPACE;
-+     case G_IO_ERROR_READ_ONLY:                  return NS_ERROR_FILE_READ_ONLY;
-+     case G_IO_ERROR_PERMISSION_DENIED:          return NS_ERROR_FILE_ACCESS_DENIED; // wrong password/login
-+     case G_IO_ERROR_CLOSED:                     return NS_BASE_STREAM_CLOSED; // was EOF
-+     case G_IO_ERROR_NOT_DIRECTORY:              return NS_ERROR_FILE_NOT_DIRECTORY;
-+     case G_IO_ERROR_PENDING:                    return NS_ERROR_IN_PROGRESS;
-+     case G_IO_ERROR_EXISTS:                     return NS_ERROR_FILE_ALREADY_EXISTS;
-+     case G_IO_ERROR_IS_DIRECTORY:               return NS_ERROR_FILE_IS_DIRECTORY;
-+     case G_IO_ERROR_NOT_MOUNTED:                return NS_ERROR_NOT_CONNECTED; // shows error
-+     case G_IO_ERROR_HOST_NOT_FOUND:             return NS_ERROR_UNKNOWN_HOST; // shows error
-+     case G_IO_ERROR_CANCELLED:                  return NS_ERROR_ABORT;
-+     case G_IO_ERROR_NOT_EMPTY:                  return NS_ERROR_FILE_DIR_NOT_EMPTY;
-+     case G_IO_ERROR_FILENAME_TOO_LONG:          return NS_ERROR_FILE_NAME_TOO_LONG;
-+     case G_IO_ERROR_INVALID_FILENAME:           return NS_ERROR_FILE_INVALID_PATH;
-+     case G_IO_ERROR_TIMED_OUT:                  return NS_ERROR_NET_TIMEOUT; // shows error
-+     case G_IO_ERROR_WOULD_BLOCK:                return NS_BASE_STREAM_WOULD_BLOCK;
-+     case G_IO_ERROR_FAILED_HANDLED:             return NS_ERROR_ABORT; // Cancel on login dialog
-+
-+/* unhandled:
-+  G_IO_ERROR_NOT_REGULAR_FILE,
-+  G_IO_ERROR_NOT_SYMBOLIC_LINK,
-+  G_IO_ERROR_NOT_MOUNTABLE_FILE,
-+  G_IO_ERROR_TOO_MANY_LINKS,
-+  G_IO_ERROR_ALREADY_MOUNTED,
-+  G_IO_ERROR_CANT_CREATE_BACKUP,
-+  G_IO_ERROR_WRONG_ETAG,
-+  G_IO_ERROR_WOULD_RECURSE,
-+  G_IO_ERROR_BUSY,
-+  G_IO_ERROR_WOULD_MERGE,
-+  G_IO_ERROR_TOO_MANY_OPEN_FILES
-+*/
-+    // Make GCC happy
-+    default:
-+      return NS_ERROR_FAILURE;
-+  }
-+
-+  return NS_ERROR_FAILURE;
-+}
-+
-+static nsresult
-+MapGIOResult(GError *result)
-+{
-+  if (!result)
-+    return NS_OK;
-+  else 
-+    return MapGIOResult(result->code);
-+}
-+/** Return values for mount operation.
-+ * These enums are used as mount operation return values.
-+ */
-+typedef enum {
-+  MOUNT_OPERATION_IN_PROGRESS, /** \enum operation in progress */
-+  MOUNT_OPERATION_SUCCESS,     /** \enum operation successful */
-+  MOUNT_OPERATION_FAILED       /** \enum operation not successful */
-+} MountOperationResult;
-+//-----------------------------------------------------------------------------
-+/**
-+ * Sort function compares according to file type (directory/file)
-+ * and alphabethical order
-+ * @param a pointer to GFileInfo object to compare
-+ * @param b pointer to GFileInfo object to compare
-+ * @return -1 when first object should be before the second, 0 when equal,
-+ * +1 when second object should be before the first
-+ */
-+static gint
-+FileInfoComparator(gconstpointer a, gconstpointer b)
-+{
-+  GFileInfo *ia = ( GFileInfo *) a;
-+  GFileInfo *ib = ( GFileInfo *) b;
-+  if (g_file_info_get_file_type(ia) == G_FILE_TYPE_DIRECTORY
-+      && g_file_info_get_file_type(ib) != G_FILE_TYPE_DIRECTORY)
-+    return -1;
-+  if (g_file_info_get_file_type(ib) == G_FILE_TYPE_DIRECTORY
-+      && g_file_info_get_file_type(ia) != G_FILE_TYPE_DIRECTORY)
-+    return 1;
-+
-+  return strcasecmp(g_file_info_get_name(ia), g_file_info_get_name(ib));
-+}
-+
-+/* Declaration of mount callback functions */
-+static void mount_enclosing_volume_finished (GObject *source_object,
-+                                             GAsyncResult *res,
-+                                             gpointer user_data);
-+static void mount_operation_ask_password (GMountOperation   *mount_op,
-+                                          const char        *message,
-+                                          const char        *default_user,
-+                                          const char        *default_domain,
-+                                          GAskPasswordFlags flags,
-+                                          gpointer          user_data);
-+//-----------------------------------------------------------------------------
-+
-+class nsGIOInputStream : public nsIInputStream
-+{
-+  public:
-+    NS_DECL_ISUPPORTS
-+    NS_DECL_NSIINPUTSTREAM
-+
-+    nsGIOInputStream(const nsCString &uriSpec)
-+      : mSpec(uriSpec)
-+      , mChannel(nsnull)
-+      , mHandle(nsnull)
-+      , mStream(nsnull)
-+      , mBytesRemaining(PR_UINT32_MAX)
-+      , mStatus(NS_OK)
-+      , mDirList(nsnull)
-+      , mDirListPtr(nsnull)
-+      , mDirBufCursor(0)
-+      , mDirOpen(PR_FALSE)
-+      , mMonitorMountInProgress("GIOInputStream::MountFinished") { }
-+
-+   ~nsGIOInputStream() { Close(); }
-+
-+    void SetChannel(nsIChannel *channel)
-+    {
-+      // We need to hold an owning reference to our channel.  This is done
-+      // so we can access the channel's notification callbacks to acquire
-+      // a reference to a nsIAuthPrompt if we need to handle an interactive
-+      // mount operation.
-+      //
-+      // However, the channel can only be accessed on the main thread, so
-+      // we have to be very careful with ownership.  Moreover, it doesn't
-+      // support threadsafe addref/release, so proxying is the answer.
-+      //
-+      // Also, it's important to note that this likely creates a reference
-+      // cycle since the channel likely owns this stream.  This reference
-+      // cycle is broken in our Close method.
-+
-+      NS_ADDREF(mChannel = channel);
-+    }
-+    void           SetMountResult(MountOperationResult result, gint error_code);
-+  private:
-+    nsresult       DoOpen();
-+    nsresult       DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead);
-+    nsresult       SetContentTypeOfChannel(const char *contentType);
-+    nsresult       MountVolume();
-+    nsresult       DoOpenDirectory();
-+    nsresult       DoOpenFile(GFileInfo *info);        
-+    nsCString             mSpec;
-+    nsIChannel           *mChannel; // manually refcounted
-+    GFile                *mHandle;
-+    GFileInputStream     *mStream;
-+    PRUint64              mBytesRemaining;
-+    nsresult              mStatus;
-+    GList                *mDirList;
-+    GList                *mDirListPtr;
-+    nsCString             mDirBuf;
-+    PRUint32              mDirBufCursor;
-+    PRPackedBool          mDirOpen;
-+    MountOperationResult  mMountRes;
-+    mozilla::Monitor      mMonitorMountInProgress;
-+    gint                  mMountErrorCode;
-+};
-+/**
-+ * Set result of mount operation and notify monitor waiting for results.
-+ * This method is called in main thread as long as it is used only 
-+ * in mount_enclosing_volume_finished function.
-+ * @param result Result of mount operation
-+ */ 
-+void
-+nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
-+{
-+  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
-+  mMountRes = result;
-+  mMountErrorCode = error_code;
-+  mon.Notify();
-+}
-+
-+/**
-+ * Start mount operation and wait in loop until it is finished. This method is 
-+ * called from thread which is trying to read from location.
-+ */
-+nsresult
-+nsGIOInputStream::MountVolume() {
-+  GMountOperation* mount_op = g_mount_operation_new();
-+  g_signal_connect (mount_op, "ask-password",
-+                    G_CALLBACK (mount_operation_ask_password), mChannel);
-+  mMountRes = MOUNT_OPERATION_IN_PROGRESS;
-+  /* g_file_mount_enclosing_volume uses a dbus request to mount the volume.
-+     Callback mount_enclosing_volume_finished is called in main thread 
-+     (not this thread on which this method is called). */
-+  g_file_mount_enclosing_volume(mHandle,
-+                                G_MOUNT_MOUNT_NONE,
-+                                mount_op,
-+                                NULL,
-+                                mount_enclosing_volume_finished,
-+                                this);
-+  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
-+  /* Waiting for finish of mount operation thread */  
-+  while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
-+    mon.Wait();
-+  
-+  g_object_unref(mount_op);
-+
-+  if (mMountRes == MOUNT_OPERATION_FAILED) {
-+    return MapGIOResult(mMountErrorCode);
-+  } else {
-+    return NS_OK;
-+  }
-+}
-+
-+/**
-+ * Create list of infos about objects in opened directory
-+ * Return: NS_OK when list obtained, otherwise error code according
-+ * to failed operation.
-+ */
-+nsresult
-+nsGIOInputStream::DoOpenDirectory()
-+{
-+  GError *error = NULL;
-+
-+  GFileEnumerator *f_enum = g_file_enumerate_children(mHandle,
-+                                                      "standard::*,time::*",
-+                                                      G_FILE_QUERY_INFO_NONE,
-+                                                      NULL,
-+                                                      &error);
-+  if (!f_enum) {
-+    nsresult rv = MapGIOResult(error);
-+    g_warning("Cannot read from directory: %s", error->message);
-+    g_error_free(error);
-+    return rv;
-+  }
-+  // fill list of file infos
-+  GFileInfo *info = g_file_enumerator_next_file(f_enum, NULL, &error);
-+  while (info) {
-+    mDirList = g_list_append(mDirList, info);
-+    info = g_file_enumerator_next_file(f_enum, NULL, &error);
-+  }
-+  g_object_unref(f_enum);
-+  if (error) {
-+    g_warning("Error reading directory content: %s", error->message);
-+    nsresult rv = MapGIOResult(error);
-+    g_error_free(error);
-+    return rv;
-+  }
-+  mDirOpen = PR_TRUE;
-+
-+  // Sort list of file infos by using FileInfoComparator function
-+  mDirList = g_list_sort(mDirList, FileInfoComparator);
-+  mDirListPtr = mDirList;
-+
-+  // Write base URL (make sure it ends with a '/')
-+  mDirBuf.Append("300: ");
-+  mDirBuf.Append(mSpec);
-+  if (mSpec.get()[mSpec.Length() - 1] != '/')
-+    mDirBuf.Append('/');
-+  mDirBuf.Append('\n');
-+
-+  // Write column names
-+  mDirBuf.Append("200: filename content-length last-modified file-type\n");
-+
-+  // Write charset (assume UTF-8)
-+  // XXX is this correct?
-+  mDirBuf.Append("301: UTF-8\n");
-+  SetContentTypeOfChannel(APPLICATION_HTTP_INDEX_FORMAT);
-+  return NS_OK;
-+}
-+
-+/**
-+ * Create file stream and set mime type for channel
-+ * @param info file info used to determine mime type
-+ * @return NS_OK when file stream created successfuly, error code otherwise
-+ */
-+nsresult
-+nsGIOInputStream::DoOpenFile(GFileInfo *info)
-+{
-+  GError *error = NULL;
-+
-+  mStream = g_file_read(mHandle, NULL, &error);
-+  if (!mStream) {
-+    nsresult rv = MapGIOResult(error);
-+    g_warning("Cannot read from file: %s", error->message);
-+    g_error_free(error);
-+    return rv;
-+  }
-+
-+  const char * content_type = g_file_info_get_content_type(info);
-+  if (content_type) {
-+    char *mime_type = g_content_type_get_mime_type(content_type);
-+    if (mime_type) {
-+      if (strcmp(mime_type, APPLICATION_OCTET_STREAM) != 0) {
-+        SetContentTypeOfChannel(mime_type);
-+      }
-+      g_free(mime_type);
-+    }
-+  } else {
-+    g_warning("Missing content type.");
-+  }
-+
-+  mBytesRemaining = g_file_info_get_size(info);
-+  // Update the content length attribute on the channel.  We do this
-+  // synchronously without proxying.  This hack is not as bad as it looks!
-+  mChannel->SetContentLength(mBytesRemaining);
-+
-+  return NS_OK;
-+}
-+
-+/**
-+ * Start file open operation, mount volume when needed and according to file type
-+ * create file output stream or read directory content.
-+ * @return NS_OK when file or directory opened successfully, error code otherwise
-+ */
-+nsresult
-+nsGIOInputStream::DoOpen()
-+{
-+  nsresult rv;
-+  GError *error = NULL;
-+
-+  NS_ASSERTION(mHandle == nsnull, "already open");
-+
-+  mHandle = g_file_new_for_uri( mSpec.get() );
-+
-+  GFileInfo *info = g_file_query_info(mHandle,
-+                                      "standard::*",
-+                                      G_FILE_QUERY_INFO_NONE,
-+                                      NULL,
-+                                      &error);
-+
-+  if (error) {
-+    if (error->domain == G_IO_ERROR && error->code == G_IO_ERROR_NOT_MOUNTED) {
-+      // location is not yet mounted, try to mount
-+      g_error_free(error);
-+      if (NS_IsMainThread()) 
-+        return NS_ERROR_NOT_CONNECTED;
-+      error = NULL;
-+      rv = MountVolume();
-+      if (rv != NS_OK) {
-+        return rv;
-+      }
-+      // get info again
-+      info = g_file_query_info(mHandle,
-+                               "standard::*",
-+                               G_FILE_QUERY_INFO_NONE,
-+                               NULL,
-+                               &error);
-+      // second try to get file info from remote files after media mount
-+      if (!info) {
-+        g_warning("Unable to get file info: %s", error->message);
-+        rv = MapGIOResult(error);
-+        g_error_free(error);
-+        return rv;
-+      }
-+    } else {
-+      g_warning("Unable to get file info: %s", error->message);
-+      rv = MapGIOResult(error);
-+      g_error_free(error);
-+      return rv;
-+    }
-+  }
-+  // Get file type to handle directories and file differently
-+  GFileType f_type = g_file_info_get_file_type(info);
-+  if (f_type == G_FILE_TYPE_DIRECTORY) {
-+    // directory
-+    rv = DoOpenDirectory();
-+  } else if (f_type != G_FILE_TYPE_UNKNOWN) {
-+    // file
-+    rv = DoOpenFile(info);
-+  } else {
-+    g_warning("Unable to get file type.");
-+    rv = NS_ERROR_FILE_NOT_FOUND;
-+  }
-+  if (info)
-+    g_object_unref(info);
-+  return rv;
-+}
-+
-+/**
-+ * Read content of file or create file list from directory
-+ * @param aBuf read destination buffer
-+ * @param aCount length of destination buffer
-+ * @param aCountRead number of read characters
-+ * @return NS_OK when read successfully, NS_BASE_STREAM_CLOSED when end of file,
-+ *         error code otherwise
-+ */
-+nsresult
-+nsGIOInputStream::DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead)
-+{
-+  nsresult rv = NS_ERROR_NOT_AVAILABLE;
-+  if (mStream) {
-+    // file read
-+    GError *error = NULL;    
-+    PRUint32 bytes_read = g_input_stream_read(G_INPUT_STREAM(mStream),
-+                                              aBuf,
-+                                              aCount,
-+                                              NULL,
-+                                              &error);
-+    if (error) {
-+      rv = MapGIOResult(error);
-+      *aCountRead = 0;
-+      g_warning("Cannot read from file: %s", error->message);
-+      g_error_free(error);
-+      return rv;
-+    }
-+    *aCountRead = bytes_read;
-+    mBytesRemaining -= *aCountRead;
-+    return NS_OK;
-+  }
-+  else if (mDirOpen) {
-+    // directory read
-+    while (aCount && rv != NS_BASE_STREAM_CLOSED)
-+    {
-+      // Copy data out of our buffer
-+      PRUint32 bufLen = mDirBuf.Length() - mDirBufCursor;
-+      if (bufLen)
-+      {
-+        PRUint32 n = PR_MIN(bufLen, aCount);
-+        memcpy(aBuf, mDirBuf.get() + mDirBufCursor, n);
-+        *aCountRead += n;
-+        aBuf += n;
-+        aCount -= n;
-+        mDirBufCursor += n;
-+      }
-+
-+      if (!mDirListPtr)    // Are we at the end of the directory list?
-+      {
-+        rv = NS_BASE_STREAM_CLOSED;
-+      }
-+      else if (aCount)     // Do we need more data?
-+      {
-+        GFileInfo *info = (GFileInfo *) mDirListPtr->data;
-+
-+        // Prune '.' and '..' from directory listing.
-+        const char * fname = g_file_info_get_name(info);
-+        if (fname && fname[0] == '.' && 
-+            (fname[1] == '\0' || (fname[1] == '.' && fname[2] == '\0')))
-+        {
-+          mDirListPtr = mDirListPtr->next;
-+          continue;
-+        }
-+
-+        mDirBuf.Assign("201: ");
-+
-+        // The "filename" field
-+        nsCString escName;
-+        nsCOMPtr<nsINetUtil> nu = do_GetService(NS_NETUTIL_CONTRACTID);
-+        if (nu && fname) {
-+          nu->EscapeString(nsDependentCString(fname),
-+                           nsINetUtil::ESCAPE_URL_PATH, escName);
-+
-+          mDirBuf.Append(escName);
-+          mDirBuf.Append(' ');
-+        }
-+
-+        // The "content-length" field
-+        // XXX truncates size from 64-bit to 32-bit
-+        mDirBuf.AppendInt(PRInt32(g_file_info_get_size(info)));
-+        mDirBuf.Append(' ');
-+
-+        // The "last-modified" field
-+        //
-+        // NSPR promises: PRTime is compatible with time_t
-+        // we just need to convert from seconds to microseconds
-+        GTimeVal gtime;
-+        g_file_info_get_modification_time(info, &gtime);
-+
-+        PRExplodedTime tm;
-+        PRTime pt = ((PRTime) gtime.tv_sec) * 1000000;
-+        PR_ExplodeTime(pt, PR_GMTParameters, &tm);
-+        {
-+          char buf[64];
-+          PR_FormatTimeUSEnglish(buf, sizeof(buf),
-+              "%a,%%20%d%%20%b%%20%Y%%20%H:%M:%S%%20GMT ", &tm);
-+          mDirBuf.Append(buf);
-+        }
-+
-+        // The "file-type" field
-+        switch (g_file_info_get_file_type(info))
-+        {
-+          case G_FILE_TYPE_REGULAR:
-+            mDirBuf.Append("FILE ");
-+            break;
-+          case G_FILE_TYPE_DIRECTORY:
-+            mDirBuf.Append("DIRECTORY ");
-+            break;
-+          case G_FILE_TYPE_SYMBOLIC_LINK:
-+            mDirBuf.Append("SYMBOLIC-LINK ");
-+            break;
-+          default:
-+            break;
-+        }
-+        mDirBuf.Append('\n');
-+
-+        mDirBufCursor = 0;
-+        mDirListPtr = mDirListPtr->next;
-+      }
-+    }
-+  }
-+  return rv;
-+}
-+
-+/**
-+ * This class is used to implement SetContentTypeOfChannel.
-+ */
-+class nsGIOSetContentTypeEvent : public nsRunnable
-+{
-+  public:
-+    nsGIOSetContentTypeEvent(nsIChannel *channel, const char *contentType)
-+      : mChannel(channel), mContentType(contentType)
-+    {
-+      // stash channel reference in mChannel.  no AddRef here!  see note
-+      // in SetContentTypeOfchannel.
-+    }
-+
-+    NS_IMETHOD Run()
-+    {
-+      mChannel->SetContentType(mContentType);
-+      return NS_OK;
-+    }
-+
-+  private:
-+    nsIChannel *mChannel;
-+    nsCString   mContentType;
-+};
-+
-+nsresult
-+nsGIOInputStream::SetContentTypeOfChannel(const char *contentType)
-+{
-+  // We need to proxy this call over to the main thread.  We post an
-+  // asynchronous event in this case so that we don't delay reading data, and
-+  // we know that this is safe to do since the channel's reference will be
-+  // released asynchronously as well.  We trust the ordering of the main
-+  // thread's event queue to protect us against memory corruption.
-+
-+  nsresult rv;
-+  nsCOMPtr<nsIRunnable> ev =
-+      new nsGIOSetContentTypeEvent(mChannel, contentType);
-+  if (!ev)
-+  {
-+    rv = NS_ERROR_OUT_OF_MEMORY;
-+  }
-+  else
-+  {
-+    rv = NS_DispatchToMainThread(ev);
-+  }
-+  return rv;
-+}
-+
-+NS_IMPL_THREADSAFE_ISUPPORTS1(nsGIOInputStream, nsIInputStream)
-+
-+/**
-+ * Free all used memory and close stream.
-+ */
-+NS_IMETHODIMP
-+nsGIOInputStream::Close()
-+{
-+  if (mStream)
-+  {
-+    g_object_unref(mStream);
-+    mStream = nsnull;
-+  }
-+
-+  if (mHandle)
-+  {
-+    g_object_unref(mHandle);
-+    mHandle = nsnull;
-+  }
-+
-+  if (mDirList)
-+  {
-+    // Destroy the list of GIOFileInfo objects...
-+    g_list_foreach(mDirList, (GFunc) g_object_unref, nsnull);
-+    g_list_free(mDirList);
-+    mDirList = nsnull;
-+    mDirListPtr = nsnull;
-+  }
-+
-+  if (mChannel)
-+  {
-+    nsresult rv = NS_OK;
-+
-+    nsCOMPtr<nsIThread> thread = do_GetMainThread();
-+    if (thread)
-+      rv = NS_ProxyRelease(thread, mChannel);
-+
-+    NS_ASSERTION(thread && NS_SUCCEEDED(rv), "leaking channel reference");
-+    mChannel = nsnull;
-+  }
-+
-+  mSpec.Truncate(); // free memory
-+
-+  // Prevent future reads from re-opening the handle.
-+  if (NS_SUCCEEDED(mStatus))
-+    mStatus = NS_BASE_STREAM_CLOSED;
-+
-+  return NS_OK;
-+}
-+
-+/**
-+ * Return number of remaining bytes available on input
-+ * @param aResult remaining bytes
-+ */
-+NS_IMETHODIMP
-+nsGIOInputStream::Available(PRUint32 *aResult)
-+{
-+  if (NS_FAILED(mStatus))
-+    return mStatus;
-+
-+  /* When remaining bytes are bigger than max PRUint32 value an aResult must
-+     be set to PRUint32 maximum */
-+  if (mBytesRemaining > PR_UINT32_MAX)
-+    *aResult = PR_UINT32_MAX;
-+  else
-+    *aResult = mBytesRemaining;
-+
-+  return NS_OK;
-+}
-+
-+/**
-+ * Trying to read from stream. When location is not available it tries to mount it.
-+ * @param aBuf buffer to put read data
-+ * @param aCount length of aBuf
-+ * @param aCountRead number of bytes actually read
-+ */
-+NS_IMETHODIMP
-+nsGIOInputStream::Read(char     *aBuf,
-+                       PRUint32  aCount,
-+                       PRUint32 *aCountRead)
-+{
-+  *aCountRead = 0;
-+  // Check if file is already opened, otherwise open it
-+  if (!mStream && !mDirOpen && mStatus == NS_OK) {
-+    mStatus = DoOpen();
-+    if (NS_FAILED(mStatus)) {
-+      return mStatus;
-+    }
-+  }
-+
-+  mStatus = DoRead(aBuf, aCount, aCountRead);
-+  // Check if all data has been read
-+  if (mStatus == NS_BASE_STREAM_CLOSED)
-+    return NS_OK;
-+
-+  // Check whenever any error appears while reading
-+  return mStatus;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOInputStream::ReadSegments(nsWriteSegmentFun aWriter,
-+                               void             *aClosure,
-+                               PRUint32          aCount,
-+                               PRUint32         *aResult)
-+{
-+  // There is no way to implement this using GnomeVFS, but fortunately
-+  // that doesn't matter.  Because we are a blocking input stream, Necko
-+  // isn't going to call our ReadSegments method.
-+  NS_NOTREACHED("nsGIOInputStream::ReadSegments");
-+  return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOInputStream::IsNonBlocking(PRBool *aResult)
-+{
-+  *aResult = PR_FALSE;
-+  return NS_OK;
-+}
-+
-+//-----------------------------------------------------------------------------
-+
-+/**
-+ * Called when finishing mount operation. Result of operation is set in 
-+ * nsGIOInputStream. This function is called in main thread as an async request 
-+ * typically from dbus.
-+ * @param source_object GFile object which requested the mount
-+ * @param res result object
-+ * @param user_data pointer to nsGIOInputStream
-+ */
-+static void
-+mount_enclosing_volume_finished (GObject *source_object,
-+                                 GAsyncResult *res,
-+                                 gpointer user_data)
-+{
-+  GError *error = NULL;
-+
-+  nsGIOInputStream* istream = static_cast<nsGIOInputStream*>(user_data);
-+  
-+  g_file_mount_enclosing_volume_finish(G_FILE (source_object), res, &error);
-+  
-+  if (error) {
-+    g_warning("Mount failed: %s %d", error->message, error->code);
-+    istream->SetMountResult(MOUNT_OPERATION_FAILED, error->code);
-+    g_error_free(error);
-+  } else {
-+    istream->SetMountResult(MOUNT_OPERATION_SUCCESS, 0);
-+  }
-+}
-+
-+/**
-+ * This function is called when username or password are requested from user.
-+ * This function is called in main thread as async request from dbus.
-+ * @param mount_op mount operation
-+ * @param message message to show to user
-+ * @param default_user preffered user
-+ * @param default_domain domain name
-+ * @param flags what type of information is required
-+ * @param user_data nsIChannel
-+ */
-+static void
-+mount_operation_ask_password (GMountOperation   *mount_op,
-+                              const char        *message,
-+                              const char        *default_user,
-+                              const char        *default_domain,
-+                              GAskPasswordFlags flags,
-+                              gpointer          user_data)
-+{
-+  nsIChannel *channel = (nsIChannel *) user_data;
-+  if (!channel) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  // We can't handle request for domain
-+  if (flags & G_ASK_PASSWORD_NEED_DOMAIN) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+
-+  nsCOMPtr<nsIAuthPrompt> prompt;
-+  NS_QueryNotificationCallbacks(channel, prompt);
-+
-+  // If no auth prompt, then give up.  We could failover to using the
-+  // WindowWatcher service, but that might defeat a consumer's purposeful
-+  // attempt to disable authentication (for whatever reason).
-+  if (!prompt) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  // Parse out the host and port...
-+  nsCOMPtr<nsIURI> uri;
-+  channel->GetURI(getter_AddRefs(uri));
-+  if (!uri) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+
-+  nsCAutoString scheme, hostPort;
-+  uri->GetScheme(scheme);
-+  uri->GetHostPort(hostPort);
-+
-+  // It doesn't make sense for either of these strings to be empty.  What kind
-+  // of funky URI is this?
-+  if (scheme.IsEmpty() || hostPort.IsEmpty()) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  // Construct the single signon key.  Altering the value of this key will
-+  // cause people's remembered passwords to be forgotten.  Think carefully
-+  // before changing the way this key is constructed.
-+  nsAutoString key, realm;
-+
-+  NS_ConvertUTF8toUTF16 dispHost(scheme);
-+  dispHost.Append(NS_LITERAL_STRING("://"));
-+  dispHost.Append(NS_ConvertUTF8toUTF16(hostPort));
-+
-+  key = dispHost;
-+  if (*default_domain != '\0')
-+  {
-+    // We assume the realm string is ASCII.  That might be a bogus assumption,
-+    // but we have no idea what encoding GnomeVFS is using, so for now we'll
-+    // limit ourselves to ISO-Latin-1.  XXX What is a better solution?
-+    realm.Append('"');
-+    realm.Append(NS_ConvertASCIItoUTF16(default_domain));
-+    realm.Append('"');
-+    key.Append(' ');
-+    key.Append(realm);
-+  }
-+  // Construct the message string...
-+  //
-+  // We use Necko's string bundle here.  This code really should be encapsulated
-+  // behind some Necko API, after all this code is based closely on the code in
-+  // nsHttpChannel.cpp.
-+  nsCOMPtr<nsIStringBundleService> bundleSvc =
-+      do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-+  if (!bundleSvc) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  nsCOMPtr<nsIStringBundle> bundle;
-+  bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties",
-+                          getter_AddRefs(bundle));
-+  if (!bundle) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  nsAutoString nsmessage;
-+
-+  if (flags & G_ASK_PASSWORD_NEED_PASSWORD) {
-+    if (flags & G_ASK_PASSWORD_NEED_USERNAME) {
-+      if (!realm.IsEmpty()) {
-+        const PRUnichar *strings[] = { realm.get(), dispHost.get() };
-+        bundle->FormatStringFromName(NS_LITERAL_STRING("EnterLoginForRealm").get(),
-+                                     strings, 2, getter_Copies(nsmessage));
-+      } else {
-+        const PRUnichar *strings[] = { dispHost.get() };
-+        bundle->FormatStringFromName(NS_LITERAL_STRING("EnterUserPasswordFor").get(),
-+                                     strings, 1, getter_Copies(nsmessage));
-+      }
-+    } else {
-+      NS_ConvertUTF8toUTF16 userName(default_user);
-+      const PRUnichar *strings[] = { userName.get(), dispHost.get() };
-+      bundle->FormatStringFromName(NS_LITERAL_STRING("EnterPasswordFor").get(),
-+                                   strings, 2, getter_Copies(nsmessage));
-+    }
-+  } else {
-+    g_warning("Unknown mount operation request (flags: %x)", flags);
-+  }
-+
-+  if (nsmessage.IsEmpty()) {
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  // Prompt the user...
-+  nsresult rv;
-+  PRBool retval = PR_FALSE;
-+  PRUnichar *user = nsnull, *pass = nsnull;
-+  if (default_user) {
-+    // user will be freed by PromptUsernameAndPassword
-+    user = ToNewUnicode(NS_ConvertUTF8toUTF16(default_user));
-+  }
-+  if (flags & G_ASK_PASSWORD_NEED_USERNAME) {
-+    rv = prompt->PromptUsernameAndPassword(nsnull, nsmessage.get(),
-+                                           key.get(),
-+                                           nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
-+                                           &user, &pass, &retval);
-+  } else {
-+    rv = prompt->PromptPassword(nsnull, nsmessage.get(),
-+                                key.get(),
-+                                nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
-+                                &pass, &retval);
-+  }
-+  if (NS_FAILED(rv) || !retval) {  //  was || user == '\0' || pass == '\0'
-+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
-+    return;
-+  }
-+  /* GIO should accept UTF8 */
-+  g_mount_operation_set_username(mount_op, NS_ConvertUTF16toUTF8(user).get());
-+  g_mount_operation_set_password(mount_op, NS_ConvertUTF16toUTF8(pass).get());
-+  nsMemory::Free(user);
-+  nsMemory::Free(pass);
-+  g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_HANDLED);
-+}
-+
-+//-----------------------------------------------------------------------------
-+
-+class nsGIOProtocolHandler : public nsIProtocolHandler
-+                           , public nsIObserver
-+{
-+  public:
-+    NS_DECL_ISUPPORTS
-+    NS_DECL_NSIPROTOCOLHANDLER
-+    NS_DECL_NSIOBSERVER
-+
-+    nsresult Init();
-+
-+  private:
-+    void   InitSupportedProtocolsPref(nsIPrefBranch *prefs);
-+    PRBool IsSupportedProtocol(const nsCString &spec);
-+
-+    nsCString mSupportedProtocols;
-+};
-+
-+NS_IMPL_ISUPPORTS2(nsGIOProtocolHandler, nsIProtocolHandler, nsIObserver)
-+
-+nsresult
-+nsGIOProtocolHandler::Init()
-+{
-+#ifdef PR_LOGGING
-+  sGIOLog = PR_NewLogModule("gio");
-+#endif
-+
-+  nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-+  if (prefs)
-+  {
-+    InitSupportedProtocolsPref(prefs);
-+    prefs->AddObserver(MOZ_GIO_SUPPORTED_PROTOCOLS, this, PR_FALSE);
-+  }
-+
-+  return NS_OK;
-+}
-+
-+void
-+nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs)
-+{
-+  // Get user preferences to determine which protocol is supported.
-+  // Gvfs/GIO has a set of supported protocols like obex, network, archive,
-+  // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be
-+  // irrelevant to process by browser. By default accept only smb and sftp
-+  // protocols so far.
-+  nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS,
-+                                   getter_Copies(mSupportedProtocols));
-+  if (NS_SUCCEEDED(rv)) {
-+    mSupportedProtocols.StripWhitespace();
-+    ToLowerCase(mSupportedProtocols);
-+  }
-+  else
-+    mSupportedProtocols.Assign("smb:,sftp:"); // use defaults
-+
-+  LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get()));
-+}
-+
-+PRBool
-+nsGIOProtocolHandler::IsSupportedProtocol(const nsCString &aSpec)
-+{
-+  const char *specString = aSpec.get();
-+  const char *colon = strchr(specString, ':');
-+  if (!colon)
-+    return PR_FALSE;
-+
-+  PRUint32 length = colon - specString + 1;
-+
-+  // <scheme> + ':'
-+  nsCString scheme(specString, length);
-+
-+  char *found = PL_strcasestr(mSupportedProtocols.get(), scheme.get());
-+  if (!found)
-+    return PR_FALSE;
-+
-+  if (found[length] != ',' && found[length] != '\0')
-+    return PR_FALSE;
-+
-+  return PR_TRUE;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::GetScheme(nsACString &aScheme)
-+{
-+  aScheme.Assign(MOZ_GIO_SCHEME);
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::GetDefaultPort(PRInt32 *aDefaultPort)
-+{
-+  *aDefaultPort = -1;
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::GetProtocolFlags(PRUint32 *aProtocolFlags)
-+{
-+  // Is URI_STD true of all GnomeVFS URI types?
-+  *aProtocolFlags = URI_STD | URI_DANGEROUS_TO_LOAD;
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::NewURI(const nsACString &aSpec,
-+                             const char *aOriginCharset,
-+                             nsIURI *aBaseURI,
-+                             nsIURI **aResult)
-+{
-+  const nsCString flatSpec(aSpec);
-+  LOG(("gio: NewURI [spec=%s]\n", flatSpec.get()));
-+
-+  if (!aBaseURI)
-+  {
-+    // XXX Is it good to support all GIO protocols?
-+    if (!IsSupportedProtocol(flatSpec))
-+      return NS_ERROR_UNKNOWN_PROTOCOL;
-+
-+    PRInt32 colon_location = flatSpec.FindChar(':');
-+    if (colon_location <= 0)
-+      return NS_ERROR_UNKNOWN_PROTOCOL;
-+
-+    // Verify that GIO supports this URI scheme.
-+    PRBool uri_scheme_supported = PR_FALSE;
-+
-+    GVfs *gvfs = g_vfs_get_default();
-+
-+    if (!gvfs) {
-+      g_warning("Cannot get GVfs object.");
-+      return NS_ERROR_UNKNOWN_PROTOCOL;
-+    }
-+
-+    const gchar* const * uri_schemes = g_vfs_get_supported_uri_schemes(gvfs);
-+
-+    while (*uri_schemes != NULL) {
-+      // While flatSpec ends with ':' the uri_scheme does not. Therefore do not
-+      // compare last character.
-+      if (StringHead(flatSpec, colon_location).Equals(*uri_schemes)) {
-+        uri_scheme_supported = PR_TRUE;
-+        break;
-+      }
-+      uri_schemes++;
-+    }
-+
-+    if (!uri_scheme_supported) {
-+      return NS_ERROR_UNKNOWN_PROTOCOL;
-+    }
-+  }
-+
-+  nsresult rv;
-+  nsCOMPtr<nsIStandardURL> url =
-+      do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv);
-+  if (NS_FAILED(rv))
-+    return rv;
-+
-+  rv = url->Init(nsIStandardURL::URLTYPE_STANDARD, -1, flatSpec,
-+                 aOriginCharset, aBaseURI);
-+  if (NS_SUCCEEDED(rv))
-+    rv = CallQueryInterface(url, aResult);
-+  return rv;
-+
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **aResult)
-+{
-+  NS_ENSURE_ARG_POINTER(aURI);
-+  nsresult rv;
-+
-+  nsCAutoString spec;
-+  rv = aURI->GetSpec(spec);
-+  if (NS_FAILED(rv))
-+    return rv;
-+
-+  nsRefPtr<nsGIOInputStream> stream = new nsGIOInputStream(spec);
-+  if (!stream)
-+  {
-+    rv = NS_ERROR_OUT_OF_MEMORY;
-+  }
-+  else
-+  {
-+    // start out assuming an unknown content-type.  we'll set the content-type
-+    // to something better once we open the URI.
-+    rv = NS_NewInputStreamChannel(aResult,
-+                                  aURI,
-+                                  stream,
-+                                  NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE));
-+    if (NS_SUCCEEDED(rv))
-+      stream->SetChannel(*aResult);
-+  }
-+  return rv;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::AllowPort(PRInt32 aPort,
-+                                const char *aScheme,
-+                                PRBool *aResult)
-+{
-+  // Don't override anything.
-+  *aResult = PR_FALSE;
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsGIOProtocolHandler::Observe(nsISupports *aSubject,
-+                              const char *aTopic,
-+                              const PRUnichar *aData)
-+{
-+  if (strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) {
-+    nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject);
-+    InitSupportedProtocolsPref(prefs);
-+  }
-+  return NS_OK;
-+}
-+
-+//-----------------------------------------------------------------------------
-+
-+#define NS_GIOPROTOCOLHANDLER_CID                    \
-+{ /* ee706783-3af8-4d19-9e84-e2ebfe213480 */         \
-+    0xee706783,                                      \
-+    0x3af8,                                          \
-+    0x4d19,                                          \
-+    {0x9e, 0x84, 0xe2, 0xeb, 0xfe, 0x21, 0x34, 0x80} \
-+}
-+
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGIOProtocolHandler, Init)
-+NS_DEFINE_NAMED_CID(NS_GIOPROTOCOLHANDLER_CID);
-+
-+static const mozilla::Module::CIDEntry kVFSCIDs[] = {
-+  { &kNS_GIOPROTOCOLHANDLER_CID, false, NULL, nsGIOProtocolHandlerConstructor },
-+  { NULL }
-+};
-+
-+static const mozilla::Module::ContractIDEntry kVFSContracts[] = {
-+  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX MOZ_GIO_SCHEME, &kNS_GIOPROTOCOLHANDLER_CID },
-+  { NULL }
-+};
-+
-+static const mozilla::Module kVFSModule = {
-+  mozilla::Module::kVersion,
-+  kVFSCIDs,
-+  kVFSContracts
-+};
-+
-+NSMODULE_DEFN(nsGIOModule) = &kVFSModule;
-diff -r 49a1b2aa43c5 netwerk/base/src/nsIOService.cpp
---- a/netwerk/base/src/nsIOService.cpp	Tue Dec 21 12:42:59 2010 +0100
-+++ b/netwerk/base/src/nsIOService.cpp	Tue Jan 11 11:17:52 2011 +0100
-@@ -454,6 +454,27 @@
-         }
- 
- #ifdef MOZ_X11
-+        // check to see whether GVFS can handle this URI scheme.  if it can
-+        // create a nsIURI for the "scheme:", then we assume it has support for
-+        // the requested protocol.  otherwise, we failover to using the default
-+        // protocol handler.
-+
-+        rv = CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"moz-gio",
-+                            result);
-+        if (NS_SUCCEEDED(rv)) {
-+            nsCAutoString spec(scheme);
-+            spec.Append(':');
-+
-+            nsIURI *uri;
-+            rv = (*result)->NewURI(spec, nsnull, nsnull, &uri);
-+            if (NS_SUCCEEDED(rv)) {
-+                NS_RELEASE(uri);
-+                return rv;
-+            }
-+
-+            NS_RELEASE(*result);
-+        }
-+
-         // check to see whether GnomeVFS can handle this URI scheme.  if it can
-         // create a nsIURI for the "scheme:", then we assume it has support for
-         // the requested protocol.  otherwise, we failover to using the default
diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch
deleted file mode 100644
index 66ec5206c..000000000
--- a/community/xulrunner-oss/xulrunner-omnijar.patch
+++ /dev/null
@@ -1,1737 +0,0 @@
-# HG changeset patch
-# Parent a7dea879b4b445a23186f438900562155bb39e99
-Bug 620931 part 1 - Use chrome manifest to register resource://gre-resources/
-
-diff --git a/layout/style/jar.mn b/layout/style/jar.mn
---- a/layout/style/jar.mn
-+++ b/layout/style/jar.mn
-@@ -1,8 +1,10 @@
- toolkit.jar:
- *  res/ua.css    (ua.css)
-    res/html.css    (html.css)
-    res/quirk.css    (quirk.css)
-    res/viewsource.css    (viewsource.css)
- *  res/forms.css    (forms.css)
-    res/arrow.gif    (arrow.gif)
-    res/arrowd.gif   (arrowd.gif)
-+
-+% resource gre-resources %res/
-diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp
---- a/netwerk/protocol/res/nsResProtocolHandler.cpp
-+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
-@@ -75,17 +75,16 @@ static nsResProtocolHandler *gResHandler
- //
- // this enables PR_LOG_ALWAYS level information and places all output in
- // the file log.txt
- //
- static PRLogModuleInfo *gResLog;
- #endif
- 
- #define kGRE           NS_LITERAL_CSTRING("gre")
--#define kGRE_RESOURCES NS_LITERAL_CSTRING("gre-resources")
- 
- //----------------------------------------------------------------------------
- // nsResURL : overrides nsStandardURL::GetFile to provide nsIFile resolution
- //----------------------------------------------------------------------------
- 
- nsresult
- nsResURL::EnsureFile()
- {
-@@ -197,28 +196,16 @@ nsResProtocolHandler::Init()
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     //
-     // make resource://gre/ point to the GRE directory
-     //
-     rv = AddSpecialDir(NS_GRE_DIR, kGRE);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
--    // make resource://gre-resources/ point to gre toolkit[.jar]/res
--    nsCOMPtr<nsIURI> greURI;
--    nsCOMPtr<nsIURI> greResURI;
--    GetSubstitution(kGRE, getter_AddRefs(greURI));
--#ifdef MOZ_CHROME_FILE_FORMAT_JAR
--    NS_NAMED_LITERAL_CSTRING(strGRE_RES_URL, "jar:chrome/toolkit.jar!/res/");
--#else
--    NS_NAMED_LITERAL_CSTRING(strGRE_RES_URL, "chrome/toolkit/res/");
--#endif
--    rv = mIOService->NewURI(strGRE_RES_URL, nsnull, greURI,
--                            getter_AddRefs(greResURI));
--    SetSubstitution(kGRE_RESOURCES, greResURI);
-     //XXXbsmedberg Neil wants a resource://pchrome/ for the profile chrome dir...
-     // but once I finish multiple chrome registration I'm not sure that it is needed
- 
-     // XXX dveditz: resource://pchrome/ defeats profile directory salting
-     // if web content can load it. Tread carefully.
- 
-     return rv;
- }
-@@ -242,22 +229,16 @@ nsResProtocolHandler::Init(nsIFile *aOmn
-     // these entries should be kept in sync with the normal Init function
- 
-     // resource:/// points to jar:omni.jar!/
-     SetSubstitution(EmptyCString(), uri);
- 
-     // resource://gre/ points to jar:omni.jar!/
-     SetSubstitution(kGRE, uri);
- 
--    urlStr += "chrome/toolkit/res/";
--    rv = mIOService->NewURI(urlStr, nsnull, nsnull, getter_AddRefs(uri));
--    NS_ENSURE_SUCCESS(rv, rv);
--
--    // resource://gre-resources/ points to jar:omni.jar!/chrome/toolkit/res/
--    SetSubstitution(kGRE_RESOURCES, uri);
-     return NS_OK;
- }
- #endif
- 
- #ifdef MOZ_IPC
- static PLDHashOperator
- EnumerateSubstitution(const nsACString& aKey,
-                       nsIURI* aURI,
-# HG changeset patch
-# Parent 3038cccba1a071d6b418e15442d0f2d9f3dcb11d
-Bug 620931 part 2 - When building --with-libxul-sdk, use the right preferences directory
-
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -183,17 +183,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
- 
- 
- libs-%:
- 	$(NSINSTALL) -D $(DIST)/install
- 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
- 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
--	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
-+	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- 
- 
- repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
- repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
- 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
- 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
- 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
-diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
---- a/toolkit/mozapps/installer/packager.mk
-+++ b/toolkit/mozapps/installer/packager.mk
-@@ -307,17 +307,17 @@ OMNIJAR_FILES	= \
-   res \
-   defaults \
-   greprefs.js \
-   jsloader \
-   $(NULL)
- 
- NON_OMNIJAR_FILES += \
-   chrome/icons/\* \
--  defaults/pref/channel-prefs.js \
-+  $(PREF_DIR)/channel-prefs.js \
-   res/cursors/\* \
-   res/MainMenu.nib/\* \
-   $(NULL)
- 
- PACK_OMNIJAR	= \
-   rm -f omni.jar components/binary.manifest && \
-   grep -h '^binary-component' components/*.manifest > binary.manifest ; \
-   sed -e 's/^binary-component/\#binary-component/' components/components.manifest > components.manifest && \
-# HG changeset patch
-# Parent cd8df8030f7ad7530692bd7c4391a8009df56a02
-Bug 620931 part 3 - Allow GRE and XUL application to use omni.jar independently
-
-We now store two independent locations for an omni.jar, allowing GRE/XRE and
-XUL application to each have their own omni.jar. And since xulrunner setups
-are very independent from the XUL applications, we implement support for both
-omni.jar and non omni.jar cases in the same runtime, with the side effect of
-allowing to switch from one to the other manually without rebuilding the
-binaries.
-
-We let the mozilla::Omnijar API handle both cases, so that callers don't need
-too much work to support them.
-
-We also make the preferences service load the same set of preferences in all
-the various cases (unified vs. separate, omni.jar vs. no omni.jar).
-
-The child process launcher for IPC is modified to pass the base directories
-needed for the mozilla::Omnijar API initialization in the child process.
-
-Finally, the startupcache file name canonicalization is modified to separate
-APP and GRE resources.
-
-diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
---- a/ipc/glue/GeckoChildProcessHost.cpp
-+++ b/ipc/glue/GeckoChildProcessHost.cpp
-@@ -440,26 +440,29 @@ GeckoChildProcessHost::PerformAsyncLaunc
-   // other end of the socketpair() from us
- 
-   std::vector<std::string> childArgv;
- 
-   childArgv.push_back(exePath.value());
- 
-   childArgv.insert(childArgv.end(), aExtraOpts.begin(), aExtraOpts.end());
- 
--#ifdef MOZ_OMNIJAR
-   // Make sure the child process can find the omnijar
-   // See XRE_InitCommandLine in nsAppRunner.cpp
--  nsCAutoString omnijarPath;
--  if (mozilla::OmnijarPath()) {
--    mozilla::OmnijarPath()->GetNativePath(omnijarPath);
--    childArgv.push_back("-omnijar");
--    childArgv.push_back(omnijarPath.get());
-+  nsCAutoString path;
-+  nsCOMPtr<nsIFile> file = mozilla::Omnijar::GetBase(mozilla::Omnijar::GRE);
-+  if (file && NS_SUCCEEDED(file->GetNativePath(path))) {
-+    childArgv.push_back("-grebase");
-+    childArgv.push_back(path.get());
-   }
--#endif
-+  file = mozilla::Omnijar::GetBase(mozilla::Omnijar::APP);
-+  if (file && NS_SUCCEEDED(file->GetNativePath(path))) {
-+    childArgv.push_back("-appbase");
-+    childArgv.push_back(path.get());
-+  }
- 
-   childArgv.push_back(pidstring);
- 
- #if defined(MOZ_CRASHREPORTER)
- #  if defined(OS_LINUX)
-   int childCrashFd, childCrashRemapFd;
-   if (!CrashReporter::CreateNotificationPipeForChild(
-         &childCrashFd, &childCrashRemapFd))
-@@ -552,26 +555,29 @@ GeckoChildProcessHost::PerformAsyncLaunc
-   for (std::vector<std::string>::iterator it = aExtraOpts.begin();
-        it != aExtraOpts.end();
-        ++it) {
-       cmdLine.AppendLooseValue(UTF8ToWide(*it));
-   }
- 
-   cmdLine.AppendLooseValue(std::wstring(mGroupId.get()));
- 
--#ifdef MOZ_OMNIJAR
-   // Make sure the child process can find the omnijar
-   // See XRE_InitCommandLine in nsAppRunner.cpp
--  nsAutoString omnijarPath;
--  if (mozilla::OmnijarPath()) {
--    mozilla::OmnijarPath()->GetPath(omnijarPath);
--    cmdLine.AppendLooseValue(UTF8ToWide("-omnijar"));
--    cmdLine.AppendLooseValue(omnijarPath.get());
-+  nsAutoString path;
-+  nsCOMPtr<nsIFile> file = mozilla::Omnijar::GetBase(mozilla::Omnijar::GRE);
-+  if (file && NS_SUCCEEDED(file->GetPath(path))) {
-+    cmdLine.AppendLooseValue(UTF8ToWide("-grebase"));
-+    cmdLine.AppendLooseValue(path.get());
-   }
--#endif
-+  file = mozilla::Omnijar::GetBase(mozilla::Omnijar::APP);
-+  if (file && NS_SUCCEEDED(file->GetPath(path))) {
-+    cmdLine.AppendLooseValue(UTF8ToWide("-appbase"));
-+    cmdLine.AppendLooseValue(path.get());
-+  }
- 
-   cmdLine.AppendLooseValue(UTF8ToWide(pidstring));
- 
- #if defined(MOZ_CRASHREPORTER)
-   cmdLine.AppendLooseValue(
-     UTF8ToWide(CrashReporter::GetChildNotificationPipe()));
- #endif
- 
-diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
---- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-@@ -81,16 +81,17 @@
- #include "nsIConsoleService.h"
- #include "nsIStorageStream.h"
- #include "nsIStringStream.h"
- #include "prmem.h"
- #if defined(XP_WIN)
- #include "nsILocalFileWin.h"
- #endif
- #include "xpcprivate.h"
-+#include "nsIResProtocolHandler.h"
- 
- #ifdef MOZ_ENABLE_LIBXUL
- #include "mozilla/scache/StartupCache.h"
- #include "mozilla/scache/StartupCacheUtils.h"
- #endif
- #include "mozilla/Omnijar.h"
- 
- #include "jsdbgapi.h"
-@@ -621,34 +622,21 @@ mozJSComponentLoader::LoadModule(nsILoca
- 
- const mozilla::Module*
- mozJSComponentLoader::LoadModuleFromJAR(nsILocalFile *aJarFile,
-                                         const nsACString &aComponentPath)
- {
- #if !defined(XPCONNECT_STANDALONE)
-     nsresult rv;
- 
--    nsCAutoString fullSpec;
--
--#ifdef MOZ_OMNIJAR
--    PRBool equal;
--    rv = aJarFile->Equals(mozilla::OmnijarPath(), &equal);
--    if (NS_SUCCEEDED(rv) && equal) {
--        fullSpec = "resource://gre/";
--    } else {
--#endif
--        nsCAutoString fileSpec;
--        NS_GetURLSpecFromActualFile(aJarFile, fileSpec);
--        fullSpec = "jar:";
--        fullSpec += fileSpec;
--        fullSpec += "!/";
--#ifdef MOZ_OMNIJAR
--    }
--#endif
--
-+    nsCAutoString fullSpec, fileSpec;
-+    NS_GetURLSpecFromActualFile(aJarFile, fileSpec);
-+    fullSpec = "jar:";
-+    fullSpec += fileSpec;
-+    fullSpec += "!/";
-     fullSpec += aComponentPath;
- 
-     nsCOMPtr<nsIURI> uri;
-     rv = NS_NewURI(getter_AddRefs(uri), fullSpec);
-     if (NS_FAILED(rv))
-         return NULL;
- 
-     nsAutoString hashstring;
-@@ -833,57 +821,138 @@ class JSScriptHolder
-     JSScriptHolder(JSContext *cx, JSScript *script)
-         : mCx(cx), mScript(script) {}
-     ~JSScriptHolder() { ::JS_DestroyScript(mCx, mScript); }
-  private:
-     JSContext *mCx;
-     JSScript *mScript;
- };
- 
-+static const char baseName[2][5] = { "gre/", "app/" };
-+
-+static inline PRBool
-+canonicalizeBase(nsCAutoString &spec, nsACString &out, mozilla::Omnijar::Type aType)
-+{
-+    nsCAutoString base;
-+    nsresult rv = mozilla::Omnijar::GetURIString(aType, base);
-+
-+    if (NS_FAILED(rv) || !base.Length())
-+        return PR_FALSE;
-+
-+    if (base.Compare(spec.get(), PR_FALSE, base.Length()))
-+        return PR_FALSE;
-+
-+    out.Append("/resource/");
-+    out.Append(baseName[aType]);
-+    out.Append(Substring(spec, base.Length()));
-+    return PR_TRUE;
-+}
- /**
-  * PathifyURI transforms mozilla .js uris into useful zip paths
-  * to make it makes it easier to manipulate startup cache entries
-  * using standard zip tools.
-  * Transformations applied:
-- *  * jsloader/<scheme> prefix is used to group mozJSComponentLoader cache entries in
-+ *  * jsloader/ prefix is used to group mozJSComponentLoader cache entries in
-  *    a top-level zip directory.
-- *  * In MOZ_OMNIJAR case resource:/// and resource://gre/ URIs refer to the same path
-- *    so treat both of them as resource://gre/
-+ *  * resource:// URIs are resolved to their corresponding file/jar URI to
-+ *    canonicalize resources URIs other than gre and app.
-+ *  * Paths under GRE or APP directory have their base path replaced with
-+ *    resource/gre or resource/app to avoid depending on install location.
-+ *  * jar:file:///path/to/file.jar!/sub/path urls are replaced with
-+ *    /path/to/file.jar/sub/path
-  *  * .bin suffix is added to the end of the path to indicate that jsloader/ entries
-  *     are binary representations of JS source.
-  * For example:
-- *  resource://gre/modules/XPCOMUtils.jsm becomes
-- *  jsloader/resource/gre/modules/XPCOMUtils.jsm.bin
-+ *  resource://gre/modules/XPCOMUtils.jsm or
-+ *  file://$GRE_DIR/modules/XPCOMUtils.jsm or
-+ *  jar:file://$GRE_DIR/omni.jar!/modules/XPCOMUtils.jsm become
-+ *     jsloader/resource/gre/modules/XPCOMUtils.jsm.bin
-+ *  file://$PROFILE_DIR/extensions/{uuid}/components/component.js becomes
-+ *     jsloader/$PROFILE_DIR/extensions/%7Buuid%7D/components/component.js.bin
-+ *  jar:file://$PROFILE_DIR/extensions/some.xpi!/components/component.js becomes
-+ *     jsloader/$PROFILE_DIR/extensions/some.xpi/components/component.js.bin
-  */
- static nsresult
- PathifyURI(nsIURI *in, nsACString &out)
- { 
--   out = "jsloader/";
--   nsCAutoString scheme;
--   nsresult rv = in->GetScheme(scheme);
--   NS_ENSURE_SUCCESS(rv, rv);
--   out.Append(scheme);
--   nsCAutoString host;
--   // OK for GetHost to fail since it's not implemented sometimes
--   in->GetHost(host);
--#ifdef MOZ_OMNIJAR
--   if (scheme.Equals("resource") && host.Length() == 0){
--       host = "gre";
--   }
--#endif
--   if (host.Length()) {
--       out.Append("/");
--       out.Append(host);
--   }
--   nsCAutoString path;
--   rv = in->GetPath(path);
--   NS_ENSURE_SUCCESS(rv, rv);
--   out.Append(path);
--   out.Append(".bin");
--   return NS_OK;
-+    PRBool equals;
-+    nsresult rv;
-+    nsCOMPtr<nsIURI> uri = in;
-+    nsCAutoString spec;
-+
-+    out = "jsloader";
-+
-+    // Resolve resource:// URIs. At the end of this if/else block, we
-+    // have both spec and uri variables identifying the same URI.
-+    if (NS_SUCCEEDED(in->SchemeIs("resource", &equals)) && equals) {
-+        nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
-+        NS_ENSURE_SUCCESS(rv, rv);
-+
-+        nsCOMPtr<nsIProtocolHandler> ph;
-+        rv = ioService->GetProtocolHandler("resource", getter_AddRefs(ph));
-+        NS_ENSURE_SUCCESS(rv, rv);
-+
-+        nsCOMPtr<nsIResProtocolHandler> irph(do_QueryInterface(ph, &rv));
-+        NS_ENSURE_SUCCESS(rv, rv);
-+
-+        rv = irph->ResolveURI(in, spec);
-+        NS_ENSURE_SUCCESS(rv, rv);
-+
-+        rv = ioService->NewURI(spec, nsnull, nsnull, getter_AddRefs(uri));
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    } else {
-+        rv = in->GetSpec(spec);
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    }
-+
-+    if (!canonicalizeBase(spec, out, mozilla::Omnijar::GRE) &&
-+        !canonicalizeBase(spec, out, mozilla::Omnijar::APP)) {
-+        if (NS_SUCCEEDED(uri->SchemeIs("file", &equals)) && equals) {
-+            nsCOMPtr<nsIFileURL> baseFileURL;
-+            baseFileURL = do_QueryInterface(uri, &rv);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            nsCAutoString path;
-+            rv = baseFileURL->GetPath(path);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            out.Append(path);
-+        } else if (NS_SUCCEEDED(uri->SchemeIs("jar", &equals)) && equals) {
-+            nsCOMPtr<nsIJARURI> jarURI = do_QueryInterface(uri, &rv);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            nsCOMPtr<nsIURI> jarFileURI;
-+            rv = jarURI->GetJARFile(getter_AddRefs(jarFileURI));
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            nsCOMPtr<nsIFileURL> jarFileURL;
-+            jarFileURL = do_QueryInterface(jarFileURI, &rv);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            nsCAutoString path;
-+            rv = jarFileURL->GetPath(path);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+            out.Append(path);
-+
-+            rv = jarURI->GetJAREntry(path);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+            out.Append("/");
-+            out.Append(path);
-+        } else { // Very unlikely
-+            nsCAutoString spec;
-+            rv = uri->GetSpec(spec);
-+            NS_ENSURE_SUCCESS(rv, rv);
-+
-+            out.Append("/");
-+            out.Append(spec);
-+        }
-+    }
-+
-+    out.Append(".bin");
-+    return NS_OK;
- }
- 
- /* static */
- #ifdef MOZ_ENABLE_LIBXUL
- nsresult
- mozJSComponentLoader::ReadScript(StartupCache* cache, nsIURI *uri,
-                                  JSContext *cx, JSScript **script)
- {
-diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
---- a/modules/libjar/nsJAR.cpp
-+++ b/modules/libjar/nsJAR.cpp
-@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile)
-   if (mLock) return NS_ERROR_FAILURE; // Already open!
- 
-   mZipFile = zipFile;
-   mOuterZipEntry.Truncate();
- 
-   mLock = PR_NewLock();
-   NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY);
-   
--#ifdef MOZ_OMNIJAR
-   // The omnijar is special, it is opened early on and closed late
-   // this avoids reopening it
--  PRBool equals;
--  nsresult rv = zipFile->Equals(mozilla::OmnijarPath(), &equals);
--  if (NS_SUCCEEDED(rv) && equals) {
--    mZip = mozilla::OmnijarReader();
-+  nsZipArchive *zip = mozilla::Omnijar::GetReader(zipFile);
-+  if (zip) {
-+    mZip = zip;
-     return NS_OK;
-   }
--#endif
-   return mZip->OpenArchive(zipFile);
- }
- 
- NS_IMETHODIMP
- nsJAR::OpenInner(nsIZipReader *aZipReader, const char *aZipEntry)
- {
-   NS_ENSURE_ARG_POINTER(aZipReader);
-   NS_ENSURE_ARG_POINTER(aZipEntry);
-@@ -234,23 +231,22 @@ nsJAR::Close()
-     mLock = nsnull;
-   }
- 
-   mParsedManifest = PR_FALSE;
-   mManifestData.Reset();
-   mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
-   mTotalItemsInManifest = 0;
- 
--#ifdef MOZ_OMNIJAR
--  if (mZip == mozilla::OmnijarReader()) {
-+  if ((mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) ||
-+      (mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::APP))) {
-     mZip.forget();
-     mZip = new nsZipArchive();
-     return NS_OK;
-   }
--#endif
-   return mZip->CloseArchive();
- }
- 
- NS_IMETHODIMP
- nsJAR::Test(const char *aEntryName)
- {
-   return mZip->Test(aEntryName);
- }
-@@ -391,22 +387,21 @@ nsJAR::GetInputStreamWithSpec(const nsAC
- NS_IMETHODIMP
- nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal)
- {
-   //-- Parameter check
-   if (!aPrincipal)
-     return NS_ERROR_NULL_POINTER;
-   *aPrincipal = nsnull;
- 
--#ifdef MOZ_OMNIJAR
-   // Don't check signatures in the omnijar - this is only
-   // interesting for extensions/XPIs.
--  if (mZip == mozilla::OmnijarReader())
-+  if ((mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) ||
-+      (mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::APP)))
-     return NS_OK;
--#endif
- 
-   //-- Parse the manifest
-   nsresult rv = ParseManifest();
-   if (NS_FAILED(rv)) return rv;
-   if (mGlobalStatus == JAR_NO_MANIFEST)
-     return NS_OK;
- 
-   PRInt16 requestedStatus;
-diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
---- a/modules/libpref/src/nsPrefService.cpp
-+++ b/modules/libpref/src/nsPrefService.cpp
-@@ -67,20 +67,18 @@
- 
- #include "prefapi.h"
- #include "prefread.h"
- #include "prefapi_private_data.h"
- #include "PrefTuple.h"
- 
- #include "nsITimelineService.h"
- 
--#ifdef MOZ_OMNIJAR
- #include "mozilla/Omnijar.h"
- #include "nsZipArchive.h"
--#endif
- 
- // Definitions
- #define INITIAL_PREF_FILES 10
- static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
- 
- // Prototypes
- static nsresult openPrefFile(nsIFile* aFile);
- static nsresult pref_InitInitialObjects(void);
-@@ -793,124 +791,144 @@ static nsresult pref_LoadPrefsInDirList(
-           pref_LoadPrefsInDir(dir, nsnull, 0); 
-         }
-       }
-     }
-   }
-   return NS_OK;
- }
- 
--//----------------------------------------------------------------------------------------
--// Initialize default preference JavaScript buffers from
--// appropriate TEXT resources
--//----------------------------------------------------------------------------------------
--static nsresult pref_InitDefaults()
--{
--  nsCOMPtr<nsIFile> greprefsFile;
--  nsresult          rv;
--
--  rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile));
--  NS_ENSURE_SUCCESS(rv, rv);
--
--  rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js"));
--  NS_ENSURE_SUCCESS(rv, rv);
--
--  rv = openPrefFile(greprefsFile);
--  if (NS_FAILED(rv)) {
--    NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?");
--  }
--
--  return NS_OK;
--}
--
--#ifdef MOZ_OMNIJAR
- static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
- {
-   nsZipItemPtr<char> manifest(jarReader, name, true);
-   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
- 
-   PrefParseState ps;
-   PREF_InitParseState(&ps, PREF_ReaderCallback, NULL);
-   nsresult rv = PREF_ParseBuf(&ps, manifest, manifest.Length());
-   PREF_FinalizeParseState(&ps);
- 
-   return rv;
- }
- 
--static nsresult pref_InitAppDefaultsFromOmnijar()
--{
--  nsresult rv;
--
--  nsZipArchive* jarReader = mozilla::OmnijarReader();
--  if (!jarReader)
--    return pref_InitDefaults();
--
--  rv = pref_ReadPrefFromJar(jarReader, "greprefs.js");
--  NS_ENSURE_SUCCESS(rv, rv);
--
--  nsZipFind *findPtr;
--  rv = jarReader->FindInit("defaults/pref/*.js$", &findPtr);
--  NS_ENSURE_SUCCESS(rv, rv);
--
--  nsAutoPtr<nsZipFind> find(findPtr);
--
--  nsTArray<nsCString> prefEntries;
--  const char *entryName;
--  PRUint16 entryNameLen;
--  while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) {
--    prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen));
--  }
--
--  prefEntries.Sort();
--  for (PRUint32 i = prefEntries.Length(); i--; ) {
--    rv = pref_ReadPrefFromJar(jarReader, prefEntries[i].get());
--    if (NS_FAILED(rv))
--      NS_WARNING("Error parsing preferences.");
--  }
--
--  return NS_OK;
--}
--#endif
--
-+//----------------------------------------------------------------------------------------
-+// Initialize default preference JavaScript buffers from
-+// appropriate TEXT resources
-+//----------------------------------------------------------------------------------------
- static nsresult pref_InitInitialObjects()
- {
-   nsresult rv;
- 
--  // first we parse the GRE default prefs. This also works if we're not using a GRE, 
--#ifdef MOZ_OMNIJAR
--  rv = pref_InitAppDefaultsFromOmnijar();
--#else
--  rv = pref_InitDefaults();
--#endif
--  NS_ENSURE_SUCCESS(rv, rv);
-+  // In omni.jar case, we load the following prefs:
-+  // - jar:$gre/omni.jar!/greprefs.js
-+  // - jar:$gre/omni.jar!/defaults/pref/*.js
-+  // In non omni.jar case, we load:
-+  // - $gre/greprefs.js
-+  //
-+  // When $app == $gre, we additionally load, in all cases:
-+  // - $gre/defaults/pref/*.js
-+  // This is kept for bug 591866 (channel-prefs.js should not be in omni.jar).
-+  // We load all files instead of channel-prefs.js only to have the same
-+  // behaviour as $app != $gre.
-+  //
-+  // When $app != $gre, we additionally load, in omni.jar case:
-+  // - jar:$app/omni.jar!/defaults/preferences/*.js
-+  // - $app/defaults/preferences/*.js
-+  // and in non omni.jar case:
-+  // - $app/defaults/preferences/*.js
- 
--  nsCOMPtr<nsIFile> defaultPrefDir;
--  // now parse the "application" default preferences
--  rv = NS_GetSpecialDirectory(NS_APP_PREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir));
--  NS_ENSURE_SUCCESS(rv, rv);
-+  nsZipFind *findPtr;
-+  nsAutoPtr<nsZipFind> find;
-+  nsTArray<nsCString> prefEntries;
-+  const char *entryName;
-+  PRUint16 entryNameLen;
- 
--  /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
--  static const char* specialFiles[] = {
-+  nsZipArchive* jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE);
-+  if (jarReader) {
-+    // Load jar:$gre/omni.jar!/greprefs.js
-+    rv = pref_ReadPrefFromJar(jarReader, "greprefs.js");
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    // Load jar:$gre/omni.jar!/defaults/pref/*.js
-+    rv = jarReader->FindInit("defaults/pref/*.js$", &findPtr);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    find = findPtr;
-+    while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) {
-+      prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen));
-+    }
-+
-+    prefEntries.Sort();
-+    for (PRUint32 i = prefEntries.Length(); i--; ) {
-+      rv = pref_ReadPrefFromJar(jarReader, prefEntries[i].get());
-+      if (NS_FAILED(rv))
-+        NS_WARNING("Error parsing preferences.");
-+    }
-+  } else {
-+    // Load $gre/greprefs.js
-+    nsCOMPtr<nsIFile> greprefsFile;
-+    rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile));
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js"));
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    rv = openPrefFile(greprefsFile);
-+    if (NS_FAILED(rv))
-+      NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?");
-+  }
-+
-+  if (!mozilla::Omnijar::HasOmnijar(mozilla::Omnijar::APP)) {
-+    // Load $gre/defaults/pref/*.js
-+    nsCOMPtr<nsIFile> defaultPrefDir;
-+
-+    rv = NS_GetSpecialDirectory(NS_APP_PREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir));
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
-+    static const char* specialFiles[] = {
- #if defined(XP_MAC) || defined(XP_MACOSX)
-       "macprefs.js"
- #elif defined(XP_WIN)
-       "winpref.js"
- #elif defined(XP_UNIX)
-       "unix.js"
--#if defined(_AIX)
-+#if defined(VMS)
-+      , "openvms.js"
-+#elif defined(_AIX)
-       , "aix.js"
- #endif
- #elif defined(XP_OS2)
-       "os2pref.js"
-+#elif defined(XP_BEOS)
-+      "beos.js"
- #endif
--  };
-+    };
- 
--  rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
--  if (NS_FAILED(rv)) {
--    NS_WARNING("Error parsing application default preferences.");
-+    rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
-+    if (NS_FAILED(rv))
-+      NS_WARNING("Error parsing application default preferences.");
-+  }
-+
-+  // Load jar:$app/omni.jar!/defaults/preferences/*.js
-+  nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
-+  if (appJarReader) {
-+    rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+    find = findPtr;
-+    prefEntries.Clear();
-+    while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) {
-+      prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen));
-+    }
-+    prefEntries.Sort();
-+    for (PRUint32 i = prefEntries.Length(); i--; ) {
-+      rv = pref_ReadPrefFromJar(appJarReader, prefEntries[i].get());
-+      if (NS_FAILED(rv))
-+        NS_WARNING("Error parsing preferences.");
-+    }
-   }
- 
-   rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-   NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
-                                 nsnull, NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID);
- 
-diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp
---- a/netwerk/protocol/res/nsResProtocolHandler.cpp
-+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
-@@ -152,97 +152,62 @@ nsResProtocolHandler::nsResProtocolHandl
- }
- 
- nsResProtocolHandler::~nsResProtocolHandler()
- {
-     gResHandler = nsnull;
- }
- 
- nsresult
--nsResProtocolHandler::AddSpecialDir(const char* aSpecialDir, const nsACString& aSubstitution)
--{
--    nsCOMPtr<nsIFile> file;
--    nsresult rv = NS_GetSpecialDirectory(aSpecialDir, getter_AddRefs(file));
--    NS_ENSURE_SUCCESS(rv, rv);
--
--    nsCOMPtr<nsIURI> uri;
--    rv = mIOService->NewFileURI(file, getter_AddRefs(uri));
--    NS_ENSURE_SUCCESS(rv, rv);
--
--    return SetSubstitution(aSubstitution, uri);
--}
--
--nsresult
- nsResProtocolHandler::Init()
- {
-     if (!mSubstitutions.Init(32))
-         return NS_ERROR_UNEXPECTED;
- 
-     nsresult rv;
- 
-     mIOService = do_GetIOService(&rv);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
--#ifdef MOZ_OMNIJAR
--    nsCOMPtr<nsIFile> omniJar(mozilla::OmnijarPath());
--    if (omniJar)
--        return Init(omniJar);
--#endif
--
--    // these entries should be kept in sync with the omnijar Init function
-+    nsCAutoString appURI, greURI;
-+    rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::APP, appURI);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+    rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::GRE, greURI);
-+    NS_ENSURE_SUCCESS(rv, rv);
- 
-     //
--    // make resource:/// point to the application directory
-+    // make resource:/// point to the application directory or omnijar
-     //
--    rv = AddSpecialDir(NS_OS_CURRENT_PROCESS_DIR, EmptyCString());
-+    nsCOMPtr<nsIURI> uri;
-+    rv = NS_NewURI(getter_AddRefs(uri), appURI.Length() ? appURI : greURI);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    rv = SetSubstitution(EmptyCString(), uri);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     //
-     // make resource://gre/ point to the GRE directory
-     //
--    rv = AddSpecialDir(NS_GRE_DIR, kGRE);
-+    if (appURI.Length()) { // We already have greURI in uri if appURI.Length() is 0.
-+        rv = NS_NewURI(getter_AddRefs(uri), greURI);
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    }
-+
-+    rv = SetSubstitution(kGRE, uri);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     //XXXbsmedberg Neil wants a resource://pchrome/ for the profile chrome dir...
-     // but once I finish multiple chrome registration I'm not sure that it is needed
- 
-     // XXX dveditz: resource://pchrome/ defeats profile directory salting
-     // if web content can load it. Tread carefully.
- 
-     return rv;
- }
- 
--#ifdef MOZ_OMNIJAR
--nsresult
--nsResProtocolHandler::Init(nsIFile *aOmniJar)
--{
--    nsresult rv;
--    nsCOMPtr<nsIURI> uri;
--    nsCAutoString omniJarSpec;
--    NS_GetURLSpecFromActualFile(aOmniJar, omniJarSpec, mIOService);
--
--    nsCAutoString urlStr("jar:");
--    urlStr += omniJarSpec;
--    urlStr += "!/";
--
--    rv = mIOService->NewURI(urlStr, nsnull, nsnull, getter_AddRefs(uri));
--    NS_ENSURE_SUCCESS(rv, rv);
--
--    // these entries should be kept in sync with the normal Init function
--
--    // resource:/// points to jar:omni.jar!/
--    SetSubstitution(EmptyCString(), uri);
--
--    // resource://gre/ points to jar:omni.jar!/
--    SetSubstitution(kGRE, uri);
--
--    return NS_OK;
--}
--#endif
--
- #ifdef MOZ_IPC
- static PLDHashOperator
- EnumerateSubstitution(const nsACString& aKey,
-                       nsIURI* aURI,
-                       void* aArg)
- {
-     nsTArray<ResourceMapping>* resources =
-             static_cast<nsTArray<ResourceMapping>*>(aArg);
-diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
---- a/startupcache/StartupCache.cpp
-+++ b/startupcache/StartupCache.cpp
-@@ -237,27 +237,36 @@ StartupCache::GetBuffer(const char* id, 
-     nsZipItemPtr<char> zipItem(mArchive, id, true);
-     if (zipItem) {
-       *outbuf = zipItem.Forget();
-       *length = zipItem.Length();
-       return NS_OK;
-     } 
-   }
- 
--#ifdef MOZ_OMNIJAR
--  if (mozilla::OmnijarReader()) {
-+  if (mozilla::Omnijar::GetReader(mozilla::Omnijar::APP)) {
-     // no need to checksum omnijarred entries
--    nsZipItemPtr<char> zipItem(mozilla::OmnijarReader(), id);
-+    nsZipItemPtr<char> zipItem(mozilla::Omnijar::GetReader(mozilla::Omnijar::APP), id);
-     if (zipItem) {
-       *outbuf = zipItem.Forget();
-       *length = zipItem.Length();
-       return NS_OK;
-     } 
-   }
--#endif
-+
-+  if (mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) {
-+    // no need to checksum omnijarred entries
-+    nsZipItemPtr<char> zipItem(mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE), id);
-+    if (zipItem) {
-+      *outbuf = zipItem.Forget();
-+      *length = zipItem.Length();
-+      return NS_OK;
-+    } 
-+  }
-+
-   return NS_ERROR_NOT_AVAILABLE;
- }
- 
- // Makes a copy of the buffer, client retains ownership of inbuf.
- nsresult
- StartupCache::PutBuffer(const char* id, const char* inbuf, PRUint32 len) 
- {
-   WaitOnWriteThread();
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3897,35 +3897,45 @@ XRE_InitCommandLine(int aArgc, char* aAr
-   CommandLine::Init(aArgc, canonArgs);
- 
-   for (int i = 0; i < aArgc; ++i)
-       free(canonArgs[i]);
-   delete[] canonArgs;
- #endif
- #endif
- 
--#ifdef MOZ_OMNIJAR
--  const char *omnijarPath = nsnull;
--  ArgResult ar = CheckArg("omnijar", PR_FALSE, &omnijarPath);
-+  const char *path = nsnull;
-+  ArgResult ar = CheckArg("grebase", PR_FALSE, &path);
-   if (ar == ARG_BAD) {
--    PR_fprintf(PR_STDERR, "Error: argument -omnijar requires an omnijar path\n");
-+    PR_fprintf(PR_STDERR, "Error: argument -grebase requires a path argument\n");
-     return NS_ERROR_FAILURE;
-   }
- 
--  if (!omnijarPath)
-+  if (!path)
-     return rv;
- 
--  nsCOMPtr<nsILocalFile> omnijar;
--  rv = NS_NewNativeLocalFile(nsDependentCString(omnijarPath), PR_TRUE,
--                             getter_AddRefs(omnijar));
--  if (NS_SUCCEEDED(rv))
--    mozilla::SetOmnijar(omnijar);
--#endif
--
--  return rv;
-+  nsCOMPtr<nsILocalFile> greBase;
-+  rv = XRE_GetFileFromPath(path, getter_AddRefs(greBase));
-+  if (NS_FAILED(rv))
-+    return rv;
-+
-+  ar = CheckArg("appbase", PR_FALSE, &path);
-+  if (ar == ARG_BAD) {
-+    PR_fprintf(PR_STDERR, "Error: argument -appbase requires a path argument\n");
-+    return NS_ERROR_FAILURE;
-+  }
-+
-+  nsCOMPtr<nsILocalFile> appBase;
-+  if (path) {
-+      rv = XRE_GetFileFromPath(path, getter_AddRefs(appBase));
-+      if (NS_FAILED(rv))
-+        return rv;
-+  }
-+
-+  return mozilla::Omnijar::SetBase(greBase, appBase);
- }
- 
- nsresult
- XRE_DeinitCommandLine()
- {
-   nsresult rv = NS_OK;
- 
- #if defined(MOZ_IPC)
-diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
---- a/toolkit/xre/nsEmbedFunctions.cpp
-+++ b/toolkit/xre/nsEmbedFunctions.cpp
-@@ -512,19 +512,17 @@ XRE_InitChildProcess(int aArgc,
-       }
- 
-       // Run the UI event loop on the main thread.
-       uiMessageLoop.MessageLoop::Run();
- 
-       // Allow ProcessChild to clean up after itself before going out of
-       // scope and being deleted
-       process->CleanUp();
--#ifdef MOZ_OMNIJAR
--      mozilla::SetOmnijar(nsnull);
--#endif
-+      mozilla::Omnijar::SetBase(nsnull, nsnull);
-     }
-   }
- 
-   NS_LogTerm();
-   return XRE_DeinitCommandLine();
- }
- 
- MessageLoop*
-diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
---- a/xpcom/build/Makefile.in
-+++ b/xpcom/build/Makefile.in
-@@ -64,28 +64,25 @@ CSRCS		= \
- 		$(NULL)
- 
- CPPSRCS		= \
- 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
- 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \
- 		nsXPComInit.cpp \
- 		nsXPCOMStrings.cpp \
- 		Services.cpp \
-+		Omnijar.cpp \
- 		$(NULL)
- 
- ifndef MOZ_ENABLE_LIBXUL
- ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
- CPPSRCS += dlldeps.cpp
- endif
- endif
- 
--ifdef MOZ_OMNIJAR
--CPPSRCS += Omnijar.cpp
--endif
--
- SHARED_LIBRARY_LIBS = \
- 		$(DEPTH)/chrome/src/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX) \
- 		../ds/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \
- 		../io/$(LIB_PREFIX)xpcomio_s.$(LIB_SUFFIX) \
- 		../components/$(LIB_PREFIX)xpcomcomponents_s.$(LIB_SUFFIX) \
- 		../threads/$(LIB_PREFIX)xpcomthreads_s.$(LIB_SUFFIX) \
- 		../proxy/src/$(LIB_PREFIX)xpcomproxy_s.$(LIB_SUFFIX) \
- 		../base/$(LIB_PREFIX)xpcombase_s.$(LIB_SUFFIX) \
-diff --git a/xpcom/build/Omnijar.cpp b/xpcom/build/Omnijar.cpp
---- a/xpcom/build/Omnijar.cpp
-+++ b/xpcom/build/Omnijar.cpp
-@@ -16,16 +16,17 @@
-  *
-  * The Initial Developer of the Original Code is
-  * Mozilla Foundation.
-  * Portions created by the Initial Developer are Copyright (C) 2010
-  * the Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s):
-  *   Michael Wu <mwu@mozilla.com>
-+ *   Mike Hommey <mh@glandium.org>
-  *
-  * Alternatively, the contents of this file may be used under the terms of
-  * either the GNU General Public License Version 2 or later (the "GPL"), or
-  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  * in which case the provisions of the GPL or the LGPL are applicable instead
-  * of those above. If you wish to allow use of your version of this file only
-  * under the terms of either the GPL or the LGPL, and not to allow others to
-  * use your version of this file under the terms of the MPL, indicate your
-@@ -33,69 +34,175 @@
-  * and other provisions required by the GPL or the LGPL. If you do not delete
-  * the provisions above, a recipient may use your version of this file under
-  * the terms of any one of the MPL, the GPL or the LGPL.
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
- #include "Omnijar.h"
- 
--#include "nsILocalFile.h"
--#include "nsXULAppAPI.h"
-+#include "nsIFile.h"
- #include "nsZipArchive.h"
-+#include "nsNetUtil.h"
- 
--static nsILocalFile* sOmnijarPath = nsnull;
--static nsZipArchive* sOmnijarReader = nsnull;
-+namespace mozilla {
- 
--static void
--SetupReader()
-+nsIFile *Omnijar::sPath[2] = { nsnull, nsnull };
-+PRBool Omnijar::sIsOmnijar[2] = { PR_FALSE, PR_FALSE };
-+
-+#ifdef MOZ_ENABLE_LIBXUL
-+nsZipArchive *Omnijar::sReader[2] = { nsnull, nsnull };
-+#endif
-+
-+static already_AddRefed<nsIFile>
-+ComputePath(nsIFile *aPath, PRBool &aIsOmnijar)
- {
--    if (!sOmnijarPath) {
--        return;
-+    PRBool isDir;
-+    aIsOmnijar = PR_FALSE;
-+    if (!aPath || NS_FAILED(aPath->IsDirectory(&isDir)) || !isDir)
-+        return nsnull;
-+
-+    nsCOMPtr<nsIFile> path;
-+#ifdef MOZ_ENABLE_LIBXUL
-+    // Search for omni.jar in the given directory
-+    if (!isDir || NS_FAILED(aPath->Clone(getter_AddRefs(path))))
-+        return nsnull;
-+
-+    if (NS_FAILED(path->AppendNative(NS_LITERAL_CSTRING("omni.jar"))))
-+        return nsnull;
-+
-+    if (NS_FAILED(path->Exists(&aIsOmnijar)))
-+        return nsnull;
-+#endif
-+
-+    if (!aIsOmnijar && NS_FAILED(aPath->Clone(getter_AddRefs(path))))
-+        return nsnull;
-+
-+    return path.forget();
-+}
-+
-+nsresult
-+Omnijar::SetBase(nsIFile *aGrePath, nsIFile *aAppPath)
-+{
-+    NS_ABORT_IF_FALSE(aGrePath || !aAppPath, "Omnijar::SetBase(NULL, something) call forbidden");
-+
-+#ifdef MOZ_ENABLE_LIBXUL
-+    if (sReader[GRE]) {
-+        sReader[GRE]->CloseArchive();
-+        delete sReader[GRE];
-+    }
-+    if (sReader[APP]) {
-+        sReader[APP]->CloseArchive();
-+        delete sReader[APP];
-+    }
-+    sReader[APP] = sReader[GRE] = nsnull;
-+#endif
-+
-+    nsresult rv;
-+    PRBool equals;
-+    if (aAppPath) {
-+        rv = aAppPath->Equals(aGrePath, &equals);
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    } else {
-+        equals = PR_TRUE;
-     }
- 
--    nsZipArchive* zipReader = new nsZipArchive();
--    if (!zipReader) {
--        NS_IF_RELEASE(sOmnijarPath);
--        return;
-+    nsCOMPtr<nsIFile> grePath = ComputePath(aGrePath, sIsOmnijar[GRE]);
-+    nsCOMPtr<nsIFile> appPath = ComputePath(equals ? nsnull : aAppPath, sIsOmnijar[APP]);
-+
-+    NS_IF_RELEASE(sPath[GRE]);
-+    sPath[GRE] = grePath;
-+    NS_IF_ADDREF(sPath[GRE]);
-+
-+    NS_IF_RELEASE(sPath[APP]);
-+    sPath[APP] = appPath;
-+    NS_IF_ADDREF(sPath[APP]);
-+
-+    return NS_OK;
-+}
-+
-+already_AddRefed<nsIFile>
-+Omnijar::GetBase(Type aType)
-+{
-+    NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized");
-+
-+    if (!sIsOmnijar[aType]) {
-+        NS_IF_ADDREF(sPath[aType]);
-+        return sPath[aType];
-     }
- 
--    if (NS_FAILED(zipReader->OpenArchive(sOmnijarPath))) {
-+    nsCOMPtr<nsIFile> file, path;
-+    if (NS_FAILED(sPath[aType]->Clone(getter_AddRefs(file))))
-+        return nsnull;
-+
-+    if (NS_FAILED(file->GetParent(getter_AddRefs(path))))
-+        return nsnull;
-+    return path.forget();
-+}
-+
-+#ifdef MOZ_ENABLE_LIBXUL
-+nsZipArchive *
-+Omnijar::GetReader(Type aType)
-+{
-+    if (!sIsOmnijar[aType])
-+        return nsnull;
-+
-+    if (sReader[aType])
-+        return sReader[aType];
-+
-+    nsZipArchive* zipReader = new nsZipArchive();
-+    if (!zipReader)
-+        return nsnull;
-+
-+    if (NS_FAILED(zipReader->OpenArchive(sPath[aType]))) {
-         delete zipReader;
--        NS_IF_RELEASE(sOmnijarPath);
--        return;
-+        return nsnull;
-     }
- 
--    sOmnijarReader = zipReader;
-+    return (sReader[aType] = zipReader);
- }
- 
--nsILocalFile*
--mozilla::OmnijarPath()
-+nsZipArchive *
-+Omnijar::GetReader(nsIFile *aPath)
- {
--    if (!sOmnijarReader)
--        SetupReader();
-+    PRBool equals;
-+    nsresult rv;
- 
--    return sOmnijarPath;
-+    if (sIsOmnijar[GRE]) {
-+        rv = sPath[GRE]->Equals(aPath, &equals);
-+        if (NS_SUCCEEDED(rv) && equals)
-+            return GetReader(GRE);
-+    }
-+    if (sIsOmnijar[APP]) {
-+        rv = sPath[APP]->Equals(aPath, &equals);
-+        if (NS_SUCCEEDED(rv) && equals)
-+            return GetReader(APP);
-+    }
-+    return nsnull;
-+}
-+#endif
-+
-+nsresult
-+Omnijar::GetURIString(Type aType, nsCString &result)
-+{
-+    NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized");
-+
-+    result = "";
-+
-+    if ((aType == APP) && (!sPath[APP]))
-+        return NS_OK;
-+
-+    nsCAutoString omniJarSpec;
-+    nsresult rv = NS_GetURLSpecFromActualFile(sPath[aType], omniJarSpec);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    if (sIsOmnijar[aType]) {
-+        result = "jar:";
-+        result += omniJarSpec;
-+        result += "!";
-+    } else {
-+        result = omniJarSpec;
-+    }
-+    result += "/";
-+    return NS_OK;
- }
- 
--nsZipArchive*
--mozilla::OmnijarReader()
--{
--    if (!sOmnijarReader)
--        SetupReader();
--
--    return sOmnijarReader;
--}
--
--void
--mozilla::SetOmnijar(nsILocalFile* aPath)
--{
--    NS_IF_RELEASE(sOmnijarPath);
--    if (sOmnijarReader) {
--        sOmnijarReader->CloseArchive();
--        delete sOmnijarReader;
--        sOmnijarReader = nsnull;
--    }
--
--    sOmnijarPath = aPath;
--    NS_IF_ADDREF(sOmnijarPath);
--}
--
-+} /* namespace mozilla */
-diff --git a/xpcom/build/Omnijar.h b/xpcom/build/Omnijar.h
---- a/xpcom/build/Omnijar.h
-+++ b/xpcom/build/Omnijar.h
-@@ -16,16 +16,17 @@
-  *
-  * The Initial Developer of the Original Code is
-  * Mozilla Foundation.
-  * Portions created by the Initial Developer are Copyright (C) 2010
-  * the Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s):
-  *   Michael Wu <mwu@mozilla.com>
-+ *   Mike Hommey <mh@glandium.org>
-  *
-  * Alternatively, the contents of this file may be used under the terms of
-  * either the GNU General Public License Version 2 or later (the "GPL"), or
-  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  * in which case the provisions of the GPL or the LGPL are applicable instead
-  * of those above. If you wish to allow use of your version of this file only
-  * under the terms of either the GPL or the LGPL, and not to allow others to
-  * use your version of this file under the terms of the MPL, indicate your
-@@ -34,29 +35,137 @@
-  * the provisions above, a recipient may use your version of this file under
-  * the terms of any one of the MPL, the GPL or the LGPL.
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
- #ifndef mozilla_Omnijar_h
- #define mozilla_Omnijar_h
- 
--class nsILocalFile;
-+#include "nscore.h"
-+#include "nsTArray.h"
-+#include "nsCOMPtr.h"
-+#include "nsString.h"
-+
-+class nsIFile;
- class nsZipArchive;
--
--#ifdef MOZ_OMNIJAR
-+class nsIURI;
- 
- namespace mozilla {
- 
-+#ifdef MOZ_ENABLE_LIBXUL
-+#define OMNIJAR_EXPORT
-+#else
-+#define OMNIJAR_EXPORT NS_EXPORT
-+#endif
-+
-+class OMNIJAR_EXPORT Omnijar {
-+private:
- /**
-- * This returns the path to the omnijar.
-- * If the omnijar isn't available, this function will return null.
-- * Callers should fallback to flat packaging if null.
-+ * Store an nsIFile for either a base directory when there is no omni.jar,
-+ * or omni.jar itself. We can store two paths here, one for GRE
-+ * (corresponding to resource://gre/) and one for APP
-+ * (corresponding to resource:/// and resource://app/), but only
-+ * store one when both point to the same location (unified).
-  */
--nsILocalFile *OmnijarPath();
--nsZipArchive *OmnijarReader();
--void SetOmnijar(nsILocalFile* aPath);
-+static nsIFile *sPath[2];
-+/**
-+ * Store whether the corresponding sPath is an omni.jar or a directory
-+ */
-+static PRBool sIsOmnijar[2];
-+
-+#ifdef MOZ_ENABLE_LIBXUL
-+/**
-+ * Cached nsZipArchives for the corresponding sPath
-+ */
-+static nsZipArchive *sReader[2];
-+#endif
-+
-+public:
-+enum Type {
-+    GRE = 0,
-+    APP = 1
-+};
-+
-+/**
-+ * Returns whether SetBase has been called at least once with
-+ * a valid nsIFile
-+ */
-+static PRBool
-+IsInitialized()
-+{
-+    // GRE path is always set after initialization.
-+    return sPath[0] != nsnull;
-+}
-+
-+/**
-+ * Sets the base directories for GRE and APP. APP base directory
-+ * may be nsnull, in case the APP and GRE directories are the same.
-+ */
-+static nsresult SetBase(nsIFile *aGrePath, nsIFile *aAppPath);
-+
-+/**
-+ * Returns an nsIFile pointing to the omni.jar file for GRE or APP.
-+ * Returns nsnull when there is no corresponding omni.jar.
-+ * Also returns nsnull for APP in the unified case.
-+ */
-+static already_AddRefed<nsIFile>
-+GetPath(Type aType)
-+{
-+    NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized");
-+
-+    if (sIsOmnijar[aType]) {
-+        NS_IF_ADDREF(sPath[aType]);
-+        return sPath[aType];
-+    }
-+    return nsnull;
-+}
-+
-+/**
-+ * Returns whether GRE or APP use an omni.jar. Returns PR_False when
-+ * using an omni.jar in the unified case.
-+ */
-+static PRBool
-+HasOmnijar(Type aType)
-+{
-+    return sIsOmnijar[aType];
-+}
-+
-+/**
-+ * Returns the base directory for GRE or APP. In the unified case,
-+ * returns nsnull for APP.
-+ */
-+static already_AddRefed<nsIFile> GetBase(Type aType);
-+
-+/**
-+ * Returns a nsZipArchive pointer for the omni.jar file for GRE or
-+ * APP. Returns nsnull in the same cases GetPath() would.
-+ */
-+#ifdef MOZ_ENABLE_LIBXUL
-+static nsZipArchive *GetReader(Type aType);
-+#else
-+static nsZipArchive *GetReader(Type aType) { return nsnull; }
-+#endif
-+
-+/**
-+ * Returns a nsZipArchive pointer for the given path IAOI the given
-+ * path is the omni.jar for either GRE or APP.
-+ */
-+#ifdef MOZ_ENABLE_LIBXUL
-+static nsZipArchive *GetReader(nsIFile *aPath);
-+#else
-+static nsZipArchive *GetReader(nsIFile *aPath) { return nsnull; }
-+#endif
-+
-+/**
-+ * Returns the URI string corresponding to the omni.jar or directory
-+ * for GRE or APP. i.e. jar:/path/to/omni.jar!/ for omni.jar and
-+ * /path/to/base/dir/ otherwise. Returns an empty string for APP in
-+ * the unified case.
-+ * The returned URI is guaranteed to end with a slash.
-+ */
-+static nsresult GetURIString(Type aType, nsCString &result);
-+
-+}; /* class Omnijar */
- 
- } /* namespace mozilla */
- 
--#endif /* MOZ_OMNIJAR */
--
- #endif /* mozilla_Omnijar_h */
-diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
---- a/xpcom/build/nsXPComInit.cpp
-+++ b/xpcom/build/nsXPComInit.cpp
-@@ -462,35 +462,35 @@ NS_InitXPCOM2(nsIServiceManager* *result
-         nsDirectoryService::gService->Set(NS_XPCOM_LIBRARY_FILE, xpcomLib);
-     }
-     
-     if (appFileLocationProvider) {
-         rv = nsDirectoryService::gService->RegisterProvider(appFileLocationProvider);
-         if (NS_FAILED(rv)) return rv;
-     }
- 
--#ifdef MOZ_OMNIJAR
-     NS_TIME_FUNCTION_MARK("Next: Omnijar init");
- 
--    if (!mozilla::OmnijarPath()) {
--        nsCOMPtr<nsILocalFile> omnijar;
-+    if (!mozilla::Omnijar::IsInitialized()) {
-+        nsCOMPtr<nsILocalFile> greDir, appDir;
-         nsCOMPtr<nsIFile> file;
- 
--        rv = NS_ERROR_FAILURE;
-         nsDirectoryService::gService->Get(NS_GRE_DIR,
-                                           NS_GET_IID(nsIFile),
-                                           getter_AddRefs(file));
--        if (file)
--            rv = file->Append(NS_LITERAL_STRING("omni.jar"));
--        if (NS_SUCCEEDED(rv))
--            omnijar = do_QueryInterface(file);
--        if (NS_SUCCEEDED(rv))
--            mozilla::SetOmnijar(omnijar);
-+        greDir = do_QueryInterface(file);
-+
-+        nsDirectoryService::gService->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
-+                                          NS_GET_IID(nsIFile),
-+                                          getter_AddRefs(file));
-+        appDir = do_QueryInterface(file);
-+
-+        rv = mozilla::Omnijar::SetBase(greDir, appDir);
-+        NS_ENSURE_SUCCESS(rv, rv);
-     }
--#endif
- 
- #ifdef MOZ_IPC
-     if ((sCommandLineWasInitialized = !CommandLine::IsInitialized())) {
-         NS_TIME_FUNCTION_MARK("Next: IPC command line init");
- 
- #ifdef OS_WIN
-         CommandLine::Init(0, nsnull);
- #else
-@@ -769,18 +769,16 @@ ShutdownXPCOM(nsIServiceManager* servMgr
-         sCommandLineWasInitialized = false;
-     }
-     if (sExitManager) {
-         delete sExitManager;
-         sExitManager = nsnull;
-     }
- #endif
- 
--#ifdef MOZ_OMNIJAR
--    mozilla::SetOmnijar(nsnull);
--#endif
-+    mozilla::Omnijar::SetBase(nsnull, nsnull);
- 
-     NS_LogTerm();
- 
-     return NS_OK;
- }
- 
- } // namespace mozilla
-diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
---- a/xpcom/components/nsComponentManager.cpp
-+++ b/xpcom/components/nsComponentManager.cpp
-@@ -175,18 +175,16 @@ NS_DEFINE_CID(kCategoryManagerCID, NS_CA
- #define COMPMGR_TIME_FUNCTION_CONTRACTID(cid)                                  \
-   NS_TIME_FUNCTION_MIN_FMT(5, "%s (line %d) (contractid: %s)", MOZ_FUNCTION_NAME, \
-                            __LINE__, (cid))
- #else
- #define COMPMGR_TIME_FUNCTION_CID(cid) do {} while (0)
- #define COMPMGR_TIME_FUNCTION_CONTRACTID(cid) do {} while (0)
- #endif
- 
--#define kOMNIJAR_PREFIX  NS_LITERAL_CSTRING("resource:///")
--
- nsresult
- nsGetServiceFromCategory::operator()(const nsIID& aIID, void** aInstancePtr) const
- {
-     nsresult rv;
-     nsXPIDLCString value;
-     nsCOMPtr<nsICategoryManager> catman;
-     nsComponentManagerImpl *compMgr = nsComponentManagerImpl::gComponentManager;
-     if (!compMgr) {
-@@ -390,47 +388,44 @@ nsresult nsComponentManagerImpl::Init()
- 
-     nsCategoryManager::GetSingleton()->SuppressNotifications(true);
- 
-     RegisterModule(&kXPCOMModule, NULL);
- 
-     for (PRUint32 i = 0; i < sStaticModules->Length(); ++i)
-         RegisterModule((*sStaticModules)[i], NULL);
- 
--#ifdef MOZ_OMNIJAR
--    if (mozilla::OmnijarPath()) {
--        nsCOMPtr<nsIZipReader> omnijarReader = new nsJAR();
--        rv = omnijarReader->Open(mozilla::OmnijarPath());
--        if (NS_SUCCEEDED(rv))
--            RegisterJarManifest(omnijarReader, "chrome.manifest", false);
-+    nsCOMPtr<nsIFile> appOmnijar = mozilla::Omnijar::GetPath(mozilla::Omnijar::APP);
-+    if (appOmnijar) {
-+        cl = sModuleLocations->InsertElementAt(1); // Insert after greDir
-+        cl->type = NS_COMPONENT_LOCATION;
-+        cl->location = do_QueryInterface(appOmnijar);
-+        cl->jar = true;
-     }
--#endif
-+    nsCOMPtr<nsIFile> greOmnijar = mozilla::Omnijar::GetPath(mozilla::Omnijar::GRE);
-+    if (greOmnijar) {
-+        cl = sModuleLocations->InsertElementAt(0);
-+        cl->type = NS_COMPONENT_LOCATION;
-+        cl->location = do_QueryInterface(greOmnijar);
-+        cl->jar = true;
-+    }
- 
-     for (PRUint32 i = 0; i < sModuleLocations->Length(); ++i) {
-         ComponentLocation& l = sModuleLocations->ElementAt(i);
-         if (!l.jar) {
-             RegisterManifestFile(l.type, l.location, false);
-             continue;
-         }
- 
-         nsCOMPtr<nsIZipReader> reader = do_CreateInstance(kZipReaderCID, &rv);
-         rv = reader->Open(l.location);
-         if (NS_SUCCEEDED(rv))
-             RegisterJarManifest(reader, "chrome.manifest", false);
-     }
- 
--#ifdef MOZ_OMNIJAR
--    if (mozilla::OmnijarPath()) {
--        cl = sModuleLocations->InsertElementAt(0);
--        cl->type = NS_COMPONENT_LOCATION;
--        cl->location = mozilla::OmnijarPath();
--        cl->jar = true;
--    }
--#endif
--
-     nsCategoryManager::GetSingleton()->SuppressNotifications(false);
- 
-     mStatus = NORMAL;
- 
-     return NS_OK;
- }
- 
- void
-# HG changeset patch
-# Parent ff1b810f78226d7f4010909d3cde05a57fdcf20c
-Bug 620931 part 4 - Fix resource://app/ to always point to the same as resource:///
-
-diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp
---- a/netwerk/protocol/res/nsResProtocolHandler.cpp
-+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
-@@ -74,16 +74,17 @@ static nsResProtocolHandler *gResHandler
- //    set NSPR_LOG_FILE=log.txt
- //
- // this enables PR_LOG_ALWAYS level information and places all output in
- // the file log.txt
- //
- static PRLogModuleInfo *gResLog;
- #endif
- 
-+#define kAPP           NS_LITERAL_CSTRING("app")
- #define kGRE           NS_LITERAL_CSTRING("gre")
- 
- //----------------------------------------------------------------------------
- // nsResURL : overrides nsStandardURL::GetFile to provide nsIFile resolution
- //----------------------------------------------------------------------------
- 
- nsresult
- nsResURL::EnsureFile()
-@@ -179,16 +180,22 @@ nsResProtocolHandler::Init()
-     nsCOMPtr<nsIURI> uri;
-     rv = NS_NewURI(getter_AddRefs(uri), appURI.Length() ? appURI : greURI);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     rv = SetSubstitution(EmptyCString(), uri);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     //
-+    // make resource://app/ point to the application directory or omnijar
-+    //
-+    rv = SetSubstitution(kAPP, uri);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    //
-     // make resource://gre/ point to the GRE directory
-     //
-     if (appURI.Length()) { // We already have greURI in uri if appURI.Length() is 0.
-         rv = NS_NewURI(getter_AddRefs(uri), greURI);
-         NS_ENSURE_SUCCESS(rv, rv);
-     }
- 
-     rv = SetSubstitution(kGRE, uri);
-diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
---- a/toolkit/xre/nsXREDirProvider.cpp
-+++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -300,19 +300,16 @@ nsXREDirProvider::GetFile(const char* aP
-     }
-   }
-   else if (!strcmp(aProperty, XRE_EXECUTABLE_FILE) && gArgv[0]) {
-     nsCOMPtr<nsILocalFile> lf;
-     rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf));
-     if (NS_SUCCEEDED(rv))
-       file = lf;
-   }
--  else if (!strcmp(aProperty, "resource:app")) {
--    rv = GetAppDir()->Clone(getter_AddRefs(file));
--  }
- 
-   else if (!strcmp(aProperty, NS_APP_PROFILE_DIR_STARTUP) && mProfileDir) {
-     return mProfileDir->Clone(aFile);
-   }
-   else if (!strcmp(aProperty, NS_APP_PROFILE_LOCAL_DIR_STARTUP)) {
-     if (mProfileLocalDir)
-       return mProfileLocalDir->Clone(aFile);
- 
-# HG changeset patch
-# Parent 7d2228db71a299afca60babff632a967d2d6c456
-Bug 620931 part 5 - Enable omni.jar by default on xulrunner
-
-diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
---- a/xulrunner/confvars.sh
-+++ b/xulrunner/confvars.sh
-@@ -36,15 +36,16 @@
- #
- # ***** END LICENSE BLOCK *****
- 
- MOZ_APP_NAME=xulrunner
- MOZ_APP_DISPLAYNAME=XULRunner
- MOZ_UPDATER=1
- MOZ_XULRUNNER=1
- MOZ_ENABLE_LIBXUL=1
-+MOZ_CHROME_FILE_FORMAT=omni
- MOZ_STATIC_BUILD_UNSUPPORTED=1
- MOZ_APP_VERSION=$MOZILLA_VERSION
- if test "$MOZ_STORAGE"; then
-   MOZ_PLACES=1
- fi
- MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
- MOZ_URL_CLASSIFIER=1
diff --git a/community/xulrunner-oss/xulrunner-version.patch b/community/xulrunner-oss/xulrunner-version.patch
deleted file mode 100644
index 8e81b23ea..000000000
--- a/community/xulrunner-oss/xulrunner-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
---- mozilla-2.0.orig/xulrunner/installer/Makefile.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/Makefile.in	2011-03-13 01:58:19.663360705 -0800
-@@ -44,6 +44,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="2.0"
-+
- NO_PKG_FILES = \
- 	xulrunner-config \
- 	regchrome* \
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index a44a19138..6e2469e5a 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123077 2011-05-08 02:14:26Z allan $
+# $Id: PKGBUILD 129828 2011-06-29 04:14:18Z allan $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
@@ -49,6 +49,7 @@ build() {
 }
 
 check() {
+  cd ${srcdir}/${pkgname}-$_basever
   make check
 }
 
diff --git a/core/binutils/binutils-2.21-strip-segfault.patch b/core/binutils/binutils-2.21-strip-segfault.patch
deleted file mode 100644
index 0133d879b..000000000
--- a/core/binutils/binutils-2.21-strip-segfault.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/binutils/objcopy.c b/binutils/objcopy.c
-index 15c4f95..b64f3d0 100644
---- a/binutils/objcopy.c
-+++ b/binutils/objcopy.c
-@@ -1,6 +1,6 @@
- /* objcopy.c -- copy object file from input to output, optionally massaging it.
-    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-    Free Software Foundation, Inc.
- 
-    This file is part of GNU Binutils.
-@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
-       struct stat buf;
-       int stat_status = 0;
-       bfd_boolean del = TRUE;
-+      bfd_boolean ok_object;
- 
-       /* Create an output file for this member.  */
-       output_name = concat (dir, "/",
-@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
-       l->obfd = NULL;
-       list = l;
- 
--      if (bfd_check_format (this_element, bfd_object))
-+      ok_object = bfd_check_format (this_element, bfd_object);
-+      if (!ok_object)
-+	bfd_nonfatal_message (NULL, this_element, NULL,
-+			      _("Unable to recognise the format of file"));
-+
-+      /* PR binutils/3110: Cope with archives
-+	 containing multiple target types.  */
-+      if (force_output_target || !ok_object)
-+	output_bfd = bfd_openw (output_name, output_target);
-+      else
-+	output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
-+
-+      if (output_bfd == NULL)
- 	{
--	  /* PR binutils/3110: Cope with archives
--	     containing multiple target types.  */
--	  if (force_output_target)
--	    output_bfd = bfd_openw (output_name, output_target);
--	  else
--	    output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
-+	  bfd_nonfatal_message (output_name, NULL, NULL, NULL);
-+	  status = 1;
-+	  return;
-+	}
-+
-+      if (ok_object)
-+	{
-+	  del = !copy_object (this_element, output_bfd, input_arch);
- 
--	  if (output_bfd == NULL)
-+	  if (del && bfd_get_arch (this_element) == bfd_arch_unknown)
-+	    /* Try again as an unknown object file.  */
-+	    ok_object = FALSE;
-+	  else if (!bfd_close (output_bfd))
- 	    {
- 	      bfd_nonfatal_message (output_name, NULL, NULL, NULL);
-+	      /* Error in new object file. Don't change archive.  */
- 	      status = 1;
--	      return;
- 	    }
--
-- 	  del = ! copy_object (this_element, output_bfd, input_arch);
--
--	  if (! del
--	      || bfd_get_arch (this_element) != bfd_arch_unknown)
--	    {
--	      if (!bfd_close (output_bfd))
--		{
--		  bfd_nonfatal_message (output_name, NULL, NULL, NULL);
--		  /* Error in new object file. Don't change archive.  */
--		  status = 1;
--		}
--	    }
--	  else
--	    goto copy_unknown_element;
- 	}
--      else
--	{
--	  bfd_nonfatal_message (NULL, this_element, NULL,
--				_("Unable to recognise the format of file"));
- 
--	  output_bfd = bfd_openw (output_name, output_target);
--copy_unknown_element:
-+      if (!ok_object)
-+	{
- 	  del = !copy_unknown_object (this_element, output_bfd);
- 	  if (!bfd_close_all_done (output_bfd))
- 	    {
--- 
-1.6.5.GIT
-
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index a28cf39df..24d25b67a 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91170 2010-09-23 14:30:47Z allan $
+# $Id: PKGBUILD 129833 2011-06-29 04:16:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -36,6 +36,10 @@ build() {
   ./configure --prefix=/usr \
     --mandir=/usr/share/man --infodir=/usr/share/info
   make
+}
+
+check() {
+  cd $srcdir/$pkgname-$pkgver
   make check
 }
 
diff --git a/core/glibc/glibc-2.13-prelink.patch b/core/glibc/glibc-2.13-prelink.patch
deleted file mode 100644
index bef7998a8..000000000
--- a/core/glibc/glibc-2.13-prelink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 9a560b3..201c9cf 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-      we need it in the memory handling later.  */
-   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
- 
-+  /* Remember the last search directory added at startup, now that
-+     malloc will no longer be the one from dl-minimal.c.  */
-+  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
-+
-   if (prelinked)
-     {
-       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
-@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 			  lossage);
-     }
- 
--  /* Remember the last search directory added at startup, now that
--     malloc will no longer be the one from dl-minimal.c.  */
--  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
--
-   if (! prelinked && rtld_multiple_ref)
-     {
-       /* There was an explicit ref to the dynamic linker as a shared lib.
diff --git a/core/less/zless b/core/less/zless
deleted file mode 100644
index 93d560bc5..000000000
--- a/core/less/zless
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-: ${PAGER=less}
-export PAGER
-
-PATH="/usr/bin:$PATH"
-export PATH
-
-exec zmore ${1+"$@"}
diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index 45c4662dd..edbdb85f6 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111157 2011-02-24 12:31:09Z allan $
+# $Id: PKGBUILD 129838 2011-06-29 04:23:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=libmpc
@@ -25,6 +25,10 @@ build() {
   
   ./configure --prefix=/usr
   make
+}
+
+check() {
+  cd "${srcdir}/mpc-${pkgver}"
   make check
 }
 
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index 09401b9bc..01f5364f0 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111924 2011-03-02 03:59:52Z allan $
+# $Id: PKGBUILD 129843 2011-06-29 04:25:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -19,6 +19,10 @@ build() {
   cd ${srcdir}/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
   make check
 }
 
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 832522a78..3da9085d7 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110342 2011-02-18 22:21:30Z allan $
+# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -36,6 +36,10 @@ build() {
   
   ./configure --prefix=/usr
   make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make check
 }
 
diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD
index 34b6bac50..649f2b572 100644
--- a/core/ppl/PKGBUILD
+++ b/core/ppl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111674 2011-02-28 10:47:00Z allan $
+# $Id: PKGBUILD 129854 2011-06-29 04:31:09Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: ezzetabi <ezzetabi at gawab dot com>
 
@@ -18,6 +18,10 @@ build() {
   cd $srcdir/ppl-$pkgver
   ./configure --prefix=/usr --enable-interfaces="c,cxx"
   make
+}
+
+check() {
+  cd $srcdir/ppl-$pkgver
   make check
 }
 
diff --git a/core/psmisc/ChangeLog b/core/psmisc/ChangeLog
deleted file mode 100644
index d9fa6dfa5..000000000
--- a/core/psmisc/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2010-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.13-1
-	* Upstream update
-
-2010-08-03  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.12-1
-	* Upstream update
-	* Updated psmisc.checkregs.fix.patch
-
-2010-04-30  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.11-1
-	* Upstream update
-
-2010-01-12  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.10-1
-	* Upstream update
-
-2009-07-31  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.8-1
-	* Upstream update
-
-2009-05-14  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.7-1
-	* Upstream update
-
-2009-04-30  Eric Belanger  <eric@archlinux.org>
-
-	* psmisc 22.6-2.1
-	* Added peekfd in x86_64 package (close FS#14514)
-
-2008-10-19  Eric Belanger  <eric@archlinux.org>
-
-	* Updated url
-	* Added ChangeLog
diff --git a/testing/shadow/LICENSE b/core/shadow/LICENSE
index c5ab15a56..c5ab15a56 100644
--- a/testing/shadow/LICENSE
+++ b/core/shadow/LICENSE
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 2d586265a..b3a130166 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 111984 2011-03-02 21:59:18Z eric $
+# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow
 pkgver=4.1.4.3
-pkgrel=1
-pkgdesc="Shadow password file utilities"
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+pkgdesc="Password and account management tool suite with support for shadow files and PAM"
+arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
-license=('custom')
+license=('BSD')
 groups=('base')
-depends=('bash' 'pam')
+depends=('bash' 'pam' 'acl')
 backup=(etc/login.defs
         etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
         etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
@@ -17,26 +17,32 @@ backup=(etc/login.defs
         etc/default/useradd)
 options=('!libtool')
 install=shadow.install
-source=(ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-$pkgver.tar.bz2
-        useradd.defaults login passwd chgpasswd chpasswd newusers defaults.pam
-	login.defs adduser shadow.cron.daily xstrdup.patch shadow-4.1.4.2-groupmod-pam-check.patch)
-md5sums=('b8608d8294ac88974f27b20f991c0e79' 'beb64d09256ea46a4d96a783f096447f'\
-         'bf137fac19884d71dc55c24b6d08e16c' 'b84204ab731bd02dca49d0637d44ebec'\
-         '65e9ebce249a5b9ed021e2790452b9e1' '453a98456b297d2a69ca7e9b5f40d10b'\
-         '453a98456b297d2a69ca7e9b5f40d10b' 'a31374fef2cba0ca34dfc7078e2969e4'\
-         'fad9a7116366f7775b1099290be840da' '6ce67e423ee19c87ae64f661310b2408'\
-         '1d64b4113e1d402746d9dd65f28a2c6f' '0eebe9d13065bec4b5d7ccf3bf46c509'\
-         '7b747f7dca38b0b6e8ee56434378baae')
-sha1sums=('ad9b85b5531ce8e68f4695efc4ac53ba7266269e' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'\
-         '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' '6f183bc7709b0a8d20ad17481a4ad025cf6e5056'\
-         '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' 'd66096ed9477bd7242e8d2cc28eaa23170269788'\
-         'd66096ed9477bd7242e8d2cc28eaa23170269788' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'\
-         'fceb6defbf959f9bee5598e89378a49297968d1a' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'\
-         '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '6010fffeed1fc6673ad9875492e1193b1a847b53'\
-         '5823f38c0085b27e7e4327ab17ecc13563a43650')
+#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2
+# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied
+source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
+        adduser chgpasswd chpasswd defaults.pam login login.defs newusers
+        passwd shadow.cron.daily useradd.defaults LICENSE
+        xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch
+        shadow-add-missing-include.patch)
+sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
+          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
+          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
+          'd66096ed9477bd7242e8d2cc28eaa23170269788'
+          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
+          '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1'
+          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
+          'd66096ed9477bd7242e8d2cc28eaa23170269788'
+          '6f183bc7709b0a8d20ad17481a4ad025cf6e5056'
+          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
+          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
+          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
+          '6010fffeed1fc6673ad9875492e1193b1a847b53'
+          '6bfe6528391eb38d338beacedd620407877b637d'
+          '9db9e62ad173f31e1039121c0124cf60826ffd7e'
+          '0697a21f7519de30821da7772677035652df4ad2')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-4.1.4.2+svn3283"
 
   #Ugh, force this to build shared libraries, for god's sake
   sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am
@@ -44,8 +50,10 @@ build() {
   autoreconf
   export LDFLAGS="$LDFLAGS -lcrypt"
 
-  patch -Np1 -i "$srcdir/xstrdup.patch"
-  patch -Np1 -i "$srcdir/shadow-4.1.4.2-groupmod-pam-check.patch"
+  patch -p1 -i "$srcdir/xstrdup.patch"
+  patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch"
+  patch -p1 -i "$srcdir/shadow-strncpy-usage.patch"
+  patch -p1 -i "$srcdir/shadow-add-missing-include.patch"
 
   # supress etc/pam.d/*, we provide our own
   sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
@@ -59,11 +67,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-4.1.4.2+svn3283"
   make DESTDIR="$pkgdir" install
 
   # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/shadow/COPYING"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
 
   # interactive useradd
   install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
@@ -77,7 +85,7 @@ package() {
   # login.defs
   install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
 
-  # PAM config - cutsom
+  # PAM config - custom
   install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login"
   install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd"
   install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd"
@@ -93,6 +101,6 @@ package() {
   done
 
   # Remove su - using su from coreutils instead
-  rm -v "$pkgdir/bin/su"
-  find "$pkgdir/usr/share/man" -name 'su.1' -exec rm -v {} \;
+  rm "$pkgdir/bin/su"
+  find "$pkgdir/usr/share/man" -name 'su.1' -delete
 }
diff --git a/core/shadow/chage b/core/shadow/chage
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/core/shadow/chage
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/core/shadow/chsh b/core/shadow/chsh
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/core/shadow/chsh
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/core/shadow/login.defs b/core/shadow/login.defs
index 653e14e4f..2500ee447 100644
--- a/core/shadow/login.defs
+++ b/core/shadow/login.defs
@@ -187,27 +187,6 @@ DEFAULT_HOME	yes
 #USERDEL_CMD	/usr/sbin/userdel_local
 
 #
-# When prompting for password without echo, getpass() can optionally
-# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*'
-# characters for each character typed.  This feature is designed to
-# confuse people looking over your shoulder when you enter a password :-).
-# Also, the new getpass() accepts both Backspace (8) and Delete (127)
-# keys to delete previous character (to cope with different terminal
-# types), Control-U to delete all characters, and beeps when there are
-# no more characters to delete, or too many characters entered.
-#
-# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour -
-# exactly one '*' displayed for each character typed.
-#
-# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace,
-# Delete, Control-U and beep continue to work as described above).
-#
-# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass()
-# without any new features.  This is the default.
-#
-#GETPASS_ASTERISKS 1
-
-#
 # Enable setting of the umask group bits to be the same as owner bits
 # (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
 # the same as gid, and username is the same as the primary group name.
diff --git a/core/shadow/shadow b/core/shadow/shadow
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/core/shadow/shadow
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch b/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch
deleted file mode 100644
index f25c4e10f..000000000
--- a/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/300790
-http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html
-
-2009-11-05  Nicolas François  <nicolas.francois@centraliens.net>
-
-	* NEWS, src/groupmod.c: Fixed groupmod when configured with
-	--enable-account-tools-setuid.
-
-diff --git a/src/groupmod.c b/src/groupmod.c
-index 4205df2..da6d77f 100644
---- a/src/groupmod.c
-+++ b/src/groupmod.c
-@@ -724,7 +724,7 @@ int main (int argc, char **argv)
- 	{
- 		struct passwd *pampw;
- 		pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
--		if (NULL == pamh) {
-+		if (NULL == pampw) {
- 			fprintf (stderr,
- 			         _("%s: Cannot determine your user name.\n"),
- 			         Prog);
diff --git a/testing/shadow/shadow-add-missing-include.patch b/core/shadow/shadow-add-missing-include.patch
index 5c9e946ef..5c9e946ef 100644
--- a/testing/shadow/shadow-add-missing-include.patch
+++ b/core/shadow/shadow-add-missing-include.patch
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/core/shadow/shadow-strncpy-usage.patch
index 46df74ace..46df74ace 100644
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ b/core/shadow/shadow-strncpy-usage.patch
diff --git a/testing/shadow/shadow_CVE-2011-0721.patch b/core/shadow/shadow_CVE-2011-0721.patch
index eb9ad80a2..eb9ad80a2 100644
--- a/testing/shadow/shadow_CVE-2011-0721.patch
+++ b/core/shadow/shadow_CVE-2011-0721.patch
diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD
index 164496502..9f2c2281f 100644
--- a/core/syslog-ng/PKGBUILD
+++ b/core/syslog-ng/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 123085 2011-05-08 03:28:44Z eric $
+# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng
 pkgver=3.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -17,14 +18,17 @@ provides=('logger')
 options=('!libtool')
 backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
         'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz \
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz
+        non-blocking-systemd-fds.patch
         syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch)
 md5sums=('5995f7dad0053a478b60a63f6f754203'
+         '25e43afe51eb2223c25168e3c3e7aaf6'
          '344dddfff946300f5576b13a7e8ea19f'
          '735636090be4582885974542d2a75855'
          '8b4441343d859c2f01c2cf799a7e6f98'
          '46e5dcff71f820d497898331a3f608fe')
 sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
+          '73b83deae9a8b945dfb13adf331e6bf6f119b83e'
           'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'
           'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
           '4481819762fd1b6f25903016a8878e63c0058fcb'
@@ -32,13 +36,21 @@ sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-# fix #22555 for kernels >=2.6.38
-  patch -p1 -i ../cap_syslog.patch 
+
+  # fix #22555 for kernels >=2.6.38
+  patch -p1 -i ../cap_syslog.patch
+
+  # fix systemd blocking FD bug
+  # https://bugzilla.balabit.com/show_bug.cgi?id=125
+  patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
     --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
     --enable-tcp-wrapper \
     --with-pidfile-dir=/var/run \
-    --disable-spoof-source
+    --disable-spoof-source \
+    --enable-systemd
+
   make
 }
 
@@ -49,4 +61,5 @@ package() {
   install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf"
   install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng"
   install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng"
+  install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service"
 }
diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/core/syslog-ng/non-blocking-systemd-fds.patch
index bd056088b..bd056088b 100644
--- a/testing/syslog-ng/non-blocking-systemd-fds.patch
+++ b/core/syslog-ng/non-blocking-systemd-fds.patch
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 82f55b52f..5bc4add28 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 114404 2011-03-13 10:37:30Z allan $
+# $Id: PKGBUILD 129859 2011-06-29 04:33:10Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -23,6 +23,10 @@ build() {
 
   ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
   make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
   make check
 }
   
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
deleted file mode 100644
index bf4d5ef88..000000000
--- a/extra/audacity/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=audacity
-pkgver=1.3.13
-pkgrel=1
-pkgdesc="A program that lets you manipulate digital audio waveforms"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://audacity.sourceforge.net/"
-license=('GPL')
-depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
-	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
-makedepends=('zip')
-options=('!makeflags')
-install=audacity.install
-source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2)
-md5sums=('57be7fadb8c8dd17b8462c7ac1561d03')
-
-build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
-    --with-portaudio --with-libsamplerate \
-    --without-libresample --with-libmad \
-    --with-id3tag --with-libflac \
-    --with-vorbis --with-libexpat \
-    --with-libsndfile --with-soundtouch \
-    --enable-unicode --without-taglib
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install
deleted file mode 100644
index 028c9f62a..000000000
--- a/extra/audacity/audacity.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 430a3002e..fca057768 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z eric $
+# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -8,25 +8,25 @@
 # look for release numbers only we make a messy PKGBUILD that can checkout svn
 # release if necessary.
 
-_svn=true
-#_svn=false
+#_svn=true
+_svn=false
 
 pkgname=blender
-pkgver=2.57b
-pkgrel=2
+pkgver=2.58
+pkgrel=1
 epoch=1
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.blender.org"
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'sdl' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gettext' 'libxi' 'libxmu' 'mesa' \
-         'freetype2' 'openal' 'libsndfile' 'libsamplerate' 'ffmpeg')
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
+         'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
 makedepends=('cmake') # 'subversion'
 install=blender.install
 if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('e6cb5523323a71c070051e6fe6efe497')
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff)
+  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
@@ -47,6 +47,7 @@ mksource() {
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 -i ../blender-ffmpeg.diff
   mkdir build
   cd build
 
@@ -60,6 +61,9 @@ build() {
     -DWITH_OPENCOLLADA:BOOL=OFF \
     -DWITH_GAMEENGINE:BOOL=ON \
     -DWITH_PLAYER:BOOL=ON \
+    -DWITH_BUILTIN_GLEW:BOOL=OFF \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
     -DPYTHON_VERSION:STRING=3.2 \
     -DPYTHON_LIBPATH:STRING=/usr/lib \
     -DPYTHON_LIBRARY:STRING=python3.2mu \
diff --git a/testing/blender/blender-ffmpeg.diff b/extra/blender/blender-ffmpeg.diff
index ffef489e2..ffef489e2 100644
--- a/testing/blender/blender-ffmpeg.diff
+++ b/extra/blender/blender-ffmpeg.diff
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
index 2fcf98022..f4d7cc443 100644
--- a/extra/blender/blender.install
+++ b/extra/blender/blender.install
@@ -1,14 +1,4 @@
 post_install() {
-  cat << EOF
-
-NOTE
-----
-
-We also ship the plugins, but most of these features can be accessed only
-from the users home directory. Therefore, you want to copy everything from
-/usr/share/blender/2.57 to ~/.blender (some are hidden files!). 
-
-EOF
   update-desktop-database -q
   update-mime-database usr/share/mime &> /dev/null
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
deleted file mode 100644
index cc4821d4e..000000000
--- a/extra/clucene/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 20266 2008-12-01 21:26:10Z tpowa $
-# Contributor: Alois Nespor <alois.nespor@gmail.com>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=clucene
-pkgver=0.9.21b
-pkgrel=1
-pkgdesc="CLucene is a C++ port of Lucene: A high-performance, full-featured text search engine."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clucene.sourceforge.net"
-license=('APACHE' 'LGPL')
-depends=('gcc-libs')
-makedepends=('libtool' 'autoconf' 'automake' 'doxygen')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.bz2)
-options=(!libtool)
-
-build() {
-  cd ${srcdir}/$pkgname-core-$pkgver
-  # fix for some packages
-  CXXFLAGS="$CXXFLAGS -fPIC"
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('ba1a8f764a2ca19c66ad907dddd88352')
diff --git a/extra/darcs/PKGBUILD b/extra/darcs/PKGBUILD
deleted file mode 100644
index d05a6c354..000000000
--- a/extra/darcs/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Simo Leone <neotuli@gmail.com>
-
-pkgname=darcs
-pkgver=2.5.2
-pkgrel=1
-pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
-arch=(i686 x86_64 'mips64el')
-url="http://darcs.net/"
-license=('GPL')
-depends=('curl' 'gmp' 'ncurses>=5.6-7')
-makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12'
-    'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7'
-    'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94')
-source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz")
-md5sums=('491b6ca01dec245a16112ad2c7e07dc1')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs configure --ghc -O --prefix=/usr \
-         --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup.lhs build
-}
-
-check() {
-    cd ${srcdir}/$pkgname-$pkgver
-    runhaskell Setup.lhs test
-}
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs copy --destdir=$pkgdir
-    rm -r $pkgdir/usr/lib/ 
-    chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1   
-}
-
diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
deleted file mode 100644
index ac10e4f4a..000000000
--- a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Thu, 7 Apr 2011 10:19:23 -0300
-Subject: [PATCH] avutil: make aes and sha api public
-
-The functions are already av_ prefixed and sha1 header is already provided.
-Install libavutil/{aes,sha}.h
-
-Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
----
- libavutil/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libavutil/Makefile b/libavutil/Makefile
-index 300acb1..baee496 100644
---- a/libavutil/Makefile
-+++ b/libavutil/Makefile
-@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
- NAME = avutil
- 
- HEADERS = adler32.h                                                     \
-+          aes.h                                                         \
-           attributes.h                                                  \
-           audioconvert.h                                                \
-           avassert.h                                                    \
-@@ -33,6 +34,7 @@ HEADERS = adler32.h                                                     \
-           random_seed.h                                                 \
-           rational.h                                                    \
-           samplefmt.h                                                   \
-+          sha.h                                                         \
-           sha1.h                                                        \
- 
- BUILT_HEADERS = avconfig.h
--- 
-1.7.2.5
-
diff --git a/extra/fprint_demo/PKGBUILD b/extra/fprint_demo/PKGBUILD
deleted file mode 100644
index 0a38bcfc7..000000000
--- a/extra/fprint_demo/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 49882 2009-08-16 19:52:26Z jgc $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=fprint_demo
-pkgver=0.4
-pkgrel=2
-pkgdesc="Simple GTK+ application to demonstrate and test libfprint's capabilities"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://reactivated.net/fprint/wiki/Main_Page"
-license=('LGPL')
-groups=('fprint')
-depends=('libfprint')
-source=(http://downloads.sourceforge.net/sourceforge/fprint/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('32e663a938e19801bdd17105d5c4d310')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/extra/haskell-binary/PKGBUILD b/extra/haskell-binary/PKGBUILD
deleted file mode 100644
index a5af5a24f..000000000
--- a/extra/haskell-binary/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=binary
-pkgname=haskell-binary
-pkgver=0.5.0.2
-pkgrel=7
-pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
-url="http://hackage.haskell.org/package/binary"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-binary/haskell-binary.install b/extra/haskell-binary/haskell-binary.install
deleted file mode 100644
index 0084ebef8..000000000
--- a/extra/haskell-binary/haskell-binary.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-binary
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-dataenc/PKGBUILD b/extra/haskell-dataenc/PKGBUILD
deleted file mode 100644
index 60e643e9f..000000000
--- a/extra/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.13.0.4
-pkgrel=3.1
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=(ghc=7.0.2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-dataenc/haskell-dataenc.install b/extra/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/extra/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-hashed-storage/PKGBUILD b/extra/haskell-hashed-storage/PKGBUILD
deleted file mode 100644
index a0d2fbb69..000000000
--- a/extra/haskell-hashed-storage/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-_hkgname=hashed-storage
-pkgname=haskell-hashed-storage
-pkgver=0.5.4
-pkgrel=3.1
-pkgdesc="Hashed file storage support code."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' 'haskell-binary=0.5.0.2' 'haskell-mmap=0.5.7'
-         'haskell-zlib=0.5.3.1'  'haskell-mtl=2.0.1.0' 'haskell-dataenc=0.13.0.4')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('e182a3fe6f977b0df85641da5df8e4f2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-hashed-storage/haskell-hashed-storage.install b/extra/haskell-hashed-storage/haskell-hashed-storage.install
deleted file mode 100644
index 6f9a6904c..000000000
--- a/extra/haskell-hashed-storage/haskell-hashed-storage.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hashed-storage
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-haskeline/PKGBUILD b/extra/haskell-haskeline/PKGBUILD
deleted file mode 100644
index 56bad3da3..000000000
--- a/extra/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.6.3.2
-pkgrel=2.1
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' sh 'haskell-utf8-string=0.3.6' 'haskell-mtl=2.0.1.0' 'haskell-terminfo=0.3.1.3')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d75863f63a1cfb499d0198e4f28ac2af')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-haskeline/haskell-haskeline.install b/extra/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/extra/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-mmap/PKGBUILD b/extra/haskell-mmap/PKGBUILD
deleted file mode 100644
index eb88a01dd..000000000
--- a/extra/haskell-mmap/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=mmap
-pkgname=haskell-mmap
-pkgver=0.5.7
-pkgrel=3.1
-pkgdesc="Memory mapped files for POSIX and Windows"
-url="http://hackage.haskell.org/package/mmap"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1f74b3f59617332b06e277f5212423c1')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-mmap/haskell-mmap.install b/extra/haskell-mmap/haskell-mmap.install
deleted file mode 100644
index 68fe74f4e..000000000
--- a/extra/haskell-mmap/haskell-mmap.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mmap
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-tar/PKGBUILD b/extra/haskell-tar/PKGBUILD
deleted file mode 100644
index 2a0626b3f..000000000
--- a/extra/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=tar
-pkgname=haskell-tar
-pkgver=0.3.1.0
-pkgrel=4.1
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('10b54856495f9ef0a42aa270085c7d5e')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-tar/haskell-tar.install b/extra/haskell-tar/haskell-tar.install
deleted file mode 100644
index e8c2f6293..000000000
--- a/extra/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-terminfo/PKGBUILD b/extra/haskell-terminfo/PKGBUILD
deleted file mode 100644
index ae3fe9866..000000000
--- a/extra/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.1.3
-pkgrel=4.1
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('8c0e052340f628b76f5687fa23379628')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-terminfo/haskell-terminfo.install b/extra/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/extra/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-utf8-string/PKGBUILD b/extra/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index 876b36c3b..000000000
--- a/extra/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.6
-pkgrel=7.1
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.0.2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-utf8-string/haskell-utf8-string.install b/extra/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/extra/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/keytouch/ChangeLog b/extra/keytouch/ChangeLog
deleted file mode 100644
index 24105e0d2..000000000
--- a/extra/keytouch/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2009-10-17  Eric Belanger  <eric@archlinux.org>
-
-	* keytouch 2.4.1-2
-	* Fixed daemon script (close FS#15693)
-
-2008-07-20  Eric Belanger  <eric@archlinux.org>
-
-	* keytouch 2.4.1-1
-	* Upstream update
-	* Removed unnecessary post-upgrade message
-
-2008-06-16  Eric Belanger  <eric@archlinux.org>
-
-	* keytouch 2.4.0-1
-	* Upstream update
-	* Patched for glibc 2.8
-	* Added to [extra] repo
-	* Added ChangeLog
diff --git a/extra/krusader/add-xz-support.patch b/extra/krusader/add-xz-support.patch
deleted file mode 100644
index 9ce44084b..000000000
--- a/extra/krusader/add-xz-support.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-From: Jan Lepper <dehtris@yahoo.de>
-Date: Thu, 27 Jan 2011 08:54:29 +0000
-Subject: add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis
-X-Git-Url: http://quickgit.kde.org/?p=krusader.git&amp;a=commitdiff&amp;h=a2db0b0fb5f58d0d648a362f75e3948f49cc87fc
----
-add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis
----
-
-
---- a/krArc/krarc.cpp
-+++ b/krArc/krarc.cpp
-@@ -423,7 +423,7 @@ void kio_krarcProtocol::get(const KUrl& 
-         if (mt)
-             emit mimeType(mt->name());
-         proc << getCmd << getPath(arcFile->url());
--        if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma") proc << localeEncodedString(file);
-+        if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma" && arcType != "xz") proc << localeEncodedString(file);
-         connect(&proc, SIGNAL(newOutputData(KProcess *, QByteArray &)),
-                 this, SLOT(receivedData(KProcess *, QByteArray &)));
-         proc.setMerge(false);
-@@ -440,7 +440,7 @@ void kio_krarcProtocol::get(const KUrl& 
-     proc.waitForFinished();
- 
-     if (!extArcReady && !decompressToFile) {
--        if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && expectedSize != decompressedLen)) {
-+        if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && arcType != "xz" && expectedSize != decompressedLen)) {
-             if (encrypted && tries) {
-                 invalidatePassword();
-                 get(url, tries - 1);
-@@ -827,6 +827,8 @@ bool kio_krarcProtocol::setArcFile(const
-         arcType = "gzip";
-     else if (arcType == "tlz")
-         arcType = "lzma";
-+    else if (arcType == "txz")
-+        arcType = "xz";
- 
-     if (arcType.isEmpty()) {
-         arcType = arcFile->mimetype();
-@@ -861,7 +863,7 @@ bool kio_krarcProtocol::initDirDict(cons
-         return false;
-     }
- 
--    if (arcType != "bzip2" && arcType != "lzma") {
-+    if (arcType != "bzip2" && arcType != "lzma" && arcType != "xz") {
-         if (arcType == "rpm") {
-             proc << listCmd << arcPath;
-             proc.setStandardOutputFile(temp.fileName());
-@@ -896,7 +898,7 @@ bool kio_krarcProtocol::initDirDict(cons
- 
-     root->append(entry);
- 
--    if (arcType == "bzip2" || arcType == "lzma") {
-+    if (arcType == "bzip2" || arcType == "lzma" || arcType == "xz") {
-         KRDEBUG("Got me here...");
-         parseLine(0, "");
-         return true;
-@@ -1207,6 +1209,14 @@ void kio_krarcProtocol::parseLine(int li
-         mode = arcFile->mode();
-         size = arcFile->size();
-     }
-+    if (arcType == "xz") {
-+        fullName = arcFile->name();
-+        if (fullName.endsWith(QLatin1String("xz"))) {
-+            fullName.truncate(fullName.length() - 3);
-+        }
-+        mode = arcFile->mode();
-+        size = arcFile->size();
-+    }
-     if (arcType == "bzip2") {
-         // There is no way to list bzip2 files, so we take our information from
-         // the archive itself...
-@@ -1460,6 +1470,13 @@ bool kio_krarcProtocol::initArcParameter
-         copyCmd = QStringList();
-         delCmd  = QStringList();
-         putCmd  = QStringList();
-+    } else if (arcType == "xz") {
-+        cmd     = fullPathName("xz");
-+        listCmd << fullPathName("xz");
-+        getCmd  << fullPathName("xz") << "-dc";
-+        copyCmd = QStringList();
-+        delCmd  = QStringList();
-+        putCmd  = QStringList();
-     } else if (arcType == "arj") {
-         cmd     = fullPathName("arj");
-         listCmd << fullPathName("arj") << "v" << "-y" << "-v";
-@@ -1544,7 +1561,7 @@ bool kio_krarcProtocol::checkStatus(int 
-         return exitCode == 0 || exitCode == 1;
-     else if (arcType == "ace" || arcType == "bzip2" || arcType == "lha" || arcType == "rpm" || arcType == "arj")
-         return exitCode == 0;
--    else if (arcType == "gzip" || arcType == "lzma")
-+    else if (arcType == "gzip" || arcType == "lzma" || arcType == "xz")
-         return exitCode == 0 || exitCode == 2;
-     else
-         return exitCode == 0;
-@@ -1566,7 +1583,8 @@ QString kio_krarcProtocol::detectArchive
-         {"bzip2", 0, "\x42\x5a\x68\x39\x31" },
-         {"gzip", 0, "\x1f\x8b"},
-         {"deb",  0, "!<arch>\ndebian-binary   " },
--        {"7z",   0, "7z\xbc\xaf\x27\x1c" }
-+        {"7z",   0, "7z\xbc\xaf\x27\x1c" }/*,
-+        {"xz",   0, "\xfd\x37\x7a\x58\x5a\x00"}*/
-     };
-     static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
- 
-@@ -1714,6 +1732,14 @@ QString kio_krarcProtocol::detectArchive
-         return "lzma";
-     }
- 
-+    if (fileName.endsWith(QLatin1String(".tar.xz")) ||
-+            fileName.endsWith(QLatin1String(".txz"))) {
-+        return "txz";
-+    }
-+    if (fileName.endsWith(QLatin1String(".xz"))) {
-+        return "xz";
-+    }
-+    
-     return QString();
- }
- 
-
---- a/krusader/Dialogs/packgui.cpp
-+++ b/krusader/Dialogs/packgui.cpp
-@@ -68,6 +68,7 @@ PackGUI::PackGUI(QString defaultName, QS
-     if (PS("tar") && PS("gzip")) typeData->addItem("tar.gz");
-     if (PS("tar") && PS("bzip2")) typeData->addItem("tar.bz2");
-     if (PS("tar") && PS("lzma")) typeData->addItem("tar.lzma");
-+    if (PS("tar") && PS("xz")) typeData->addItem("tar.xz");
-     if (PS("zip")) typeData->addItem("zip");
-     if (PS("rar")) typeData->addItem("rar");
-     if (PS("lha")) typeData->addItem("lha");
-
---- a/krusader/Konfigurator/kgarchives.cpp
-+++ b/krusader/Konfigurator/kgarchives.cpp
-@@ -62,6 +62,7 @@ KgArchives::KgArchives(bool first, QWidg
-     {{"Archives", "Do Tar",   _DoTar,   i18n("Tar"),   false,  ""},
-         {"Archives", "Do GZip",  _DoGZip,  i18n("GZip"),  false,  ""},
-         {"Archives", "Do LZMA",  _DoLZMA,  i18n("LZMA"),  false,  ""},
-+        {"Archives", "Do XZ",    _DoXZ,    i18n("XZ"),    false,  ""},
-         {"Archives", "Do BZip2", _DoBZip2, i18n("BZip2"), false,  ""},
-         {"Archives", "Do UnZip", _DoUnZip, i18n("Zip"),   false,  ""},
-         {"Archives", "Do UnRar", _DoUnRar, i18n("Rar"),   false,  ""},
-@@ -73,7 +74,7 @@ KgArchives::KgArchives(bool first, QWidg
-         {"Archives", "Do 7z",    _Do7z,    i18n("7zip"),  false,  ""}
-     };
- 
--    cbs = createCheckBoxGroup(3, 0, packers, 12, generalGrp);
-+    cbs = createCheckBoxGroup(3, 0, packers, 13, generalGrp);
-     generalGrid->addWidget(cbs, 1, 0);
- 
-     addLabel(generalGrid, 2, 0, i18n("The archives that are \"grayed out\" were unavailable on your\n"
-@@ -148,6 +149,7 @@ void KgArchives::disableNonExistingPacke
-     cbs->find("Do GZip")->setEnabled(PS("gzip"));
-     cbs->find("Do BZip2")->setEnabled(PS("bzip2"));
-     cbs->find("Do LZMA")->setEnabled(PS("lzma"));
-+    cbs->find("Do XZ")->setEnabled(PS("xz"));
-     cbs->find("Do UnZip")->setEnabled(PS("unzip"));
-     cbs->find("Do Lha")->setEnabled(PS("lha"));
-     cbs->find("Do RPM")->setEnabled(PS("rpm") || PS("cpio"));
-
---- a/krusader/Konfigurator/kgdependencies.cpp
-+++ b/krusader/Konfigurator/kgdependencies.cpp
-@@ -100,6 +100,7 @@ KgDependencies::KgDependencies(bool firs
-     addApplication("unrar", archGrid1, 12, packers_tab, PAGE_PACKERS);
-     addApplication("unzip", archGrid1, 13, packers_tab, PAGE_PACKERS);
-     addApplication("zip",   archGrid1, 14, packers_tab, PAGE_PACKERS);
-+    addApplication("xz",    archGrid1, 15, packers_tab, PAGE_PACKERS);
- 
-     //  ---------------------------- CHECKSUM TAB -------------------------------------
-     QWidget *checksum_tab = new QWidget(tabWidget);
-
---- a/krusader/Konfigurator/kggeneral.cpp
-+++ b/krusader/Konfigurator/kggeneral.cpp
-@@ -193,6 +193,7 @@ void KgGeneral::createExtensionsTab()
-     defaultAtomicExtensions += ".tar.gz";
-     defaultAtomicExtensions += ".tar.bz2";
-     defaultAtomicExtensions += ".tar.lzma";
-+    defaultAtomicExtensions += ".tar.xz";
-     defaultAtomicExtensions += ".moc.cpp";
- 
-     listBox = createListBox("Look&Feel", "Atomic Extensions",
-
---- a/krusader/Konfigurator/kgprotocols.cpp
-+++ b/krusader/Konfigurator/kgprotocols.cpp
-@@ -51,12 +51,14 @@ QString KgProtocols::defaultKrarcMimes =
-         "application/x-gzip,application/x-jar,"
-         "application/x-lha,application/x-lha-compressed,"
-         "application/x-rar,application/x-rar-compressed,"
-+        "application/x-xz,"
-         "application/x-rpm,application/zip,"
-         "application/x-zip,application/x-zip-compressed";
- QString KgProtocols::defaultTarMimes   = "application/x-tar,application/x-tarz,"
-         "application/x-bzip-compressed-tar,"
-         "application/x-compressed-tar,"
--        "application/x-tbz,application/x-tgz";
-+        "application/x-tbz,application/x-tgz,"
-+        "application/x-xz-compressed-tar";
- 
- KgProtocols::KgProtocols(bool first, QWidget* parent) :
-         KonfiguratorPage(first, parent)
-
---- a/krusader/Konfigurator/krresulttable.cpp
-+++ b/krusader/Konfigurator/krresulttable.cpp
-@@ -102,6 +102,7 @@ KrArchiverResultTable::KrArchiverResultT
-     Archiver* gzip  = new Archiver("gzip",  "http://www.gnu.org",      PS("gzip"),  true,  true);
-     Archiver* bzip2 = new Archiver("bzip2", "http://www.gnu.org",      PS("bzip2"), true,  true);
-     Archiver* lzma  = new Archiver("lzma",  "http://tukaani.org/lzma", PS("lzma"),  true,  true);
-+    Archiver* xz    = new Archiver("xz",    "http://tukaani.org/xz",   PS("xz"),    true,  true);
-     Archiver* lha   = new Archiver("lha",   "http://www.gnu.org",      PS("lha"),   true,  true);
-     Archiver* zip   = new Archiver("zip",   "http://www.info-zip.org", PS("zip"),   true,  false);
-     Archiver* unzip = new Archiver("unzip", "http://www.info-zip.org", PS("unzip"), false, true);
-@@ -139,6 +140,7 @@ KrArchiverResultTable::KrArchiverResultT
-     addRow(gzip, _grid);
-     addRow(bzip2, _grid);
-     addRow(lzma, _grid);
-+    addRow(xz, _grid);
-     addRow(lha, _grid);
-     addRow(zip, _grid);
-     addRow(unzip, _grid);
-@@ -155,6 +157,7 @@ KrArchiverResultTable::KrArchiverResultT
-     delete gzip;
-     delete bzip2;
-     delete lzma;
-+    delete xz;
-     delete lha;
-     delete zip;
-     delete unzip;
-
---- a/krusader/Panel/krview.cpp
-+++ b/krusader/Panel/krview.cpp
-@@ -367,6 +367,7 @@ void KrView::initProperties()
-     defaultAtomicExtensions += ".tar.gz";
-     defaultAtomicExtensions += ".tar.bz2";
-     defaultAtomicExtensions += ".tar.lzma";
-+    defaultAtomicExtensions += ".tar.xz";
-     defaultAtomicExtensions += ".moc.cpp";
-     QStringList atomicExtensions = grpSvr.readEntry("Atomic Extensions", defaultAtomicExtensions);
-     for (QStringList::iterator i = atomicExtensions.begin(); i != atomicExtensions.end();) {
-
---- a/krusader/VFS/krarchandler.cpp
-+++ b/krusader/VFS/krarchandler.cpp
-@@ -85,7 +85,7 @@ public:
- };
- #endif
- 
--static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;gzip;krarc;zip").split(';');
-+static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;xz;gzip;krarc;zip").split(';');
- 
- KWallet::Wallet * KRarcHandler::wallet = 0;
- 
-@@ -98,6 +98,7 @@ QStringList KRarcHandler::supportedPacke
-     if (KrServices::cmdExist("gzip")) packers.append("gzip");
-     if (KrServices::cmdExist("bzip2")) packers.append("bzip2");
-     if (KrServices::cmdExist("lzma")) packers.append("lzma");
-+    if (KrServices::cmdExist("xz")) packers.append("xz");
-     if (KrServices::cmdExist("unzip")) packers.append("unzip");
-     if (KrServices::cmdExist("zip")) packers.append("zip");
-     if (KrServices::cmdExist("lha")) packers.append("lha");
-@@ -134,6 +135,8 @@ bool KRarcHandler::arcSupported(QString 
-         return true;
-     else if (type == "-tlz" && lst.contains("tar"))
-         return true;
-+    else if (type == "-txz" && lst.contains("tar"))
-+        return true;
-     else if (type == "tarz" && lst.contains("tar"))
-         return true;
-     else if (type == "gzip" && lst.contains("gzip"))
-@@ -142,6 +145,8 @@ bool KRarcHandler::arcSupported(QString 
-         return true;
-     else if (type == "lzma" && lst.contains("lzma"))
-         return true;
-+    else if (type == "-xz" && lst.contains("xz"))
-+        return true;
-     else if (type == "-lha" && lst.contains("lha"))
-         return true;
-     else if (type == "-ace" && lst.contains("unace"))
-@@ -173,6 +178,7 @@ bool KRarcHandler::arcHandled(QString ty
-             (type == "-tar" && group.readEntry("Do Tar" , _DoTar)) ||
-             (type == "-tbz" && group.readEntry("Do BZip2", _DoBZip2)) ||
-             (type == "-tlz" && group.readEntry("Do LZMA", _DoLZMA)) ||
-+            (type == "-txz" && group.readEntry("Do XZ", _DoXZ)) ||
-             (type == "gzip" && group.readEntry("Do GZip" , _DoGZip)) ||
-             (type == "zip2" && group.readEntry("Do BZip2", _DoBZip2)) ||
-             (type == "-zip" && group.readEntry("Do UnZip", _DoUnZip)) ||
-@@ -198,7 +204,7 @@ long KRarcHandler::arcFileCount(QString 
-     if (!arcSupported(type)) return 0;
- 
-     // bzip an gzip archive contains only one file
--    if (type == "zip2" || type == "gzip" || type == "lzma") return 1L;
-+    if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") return 1L;
- 
-     // set the right lister to do the job
-     QStringList lister;
-@@ -209,6 +215,7 @@ long KRarcHandler::arcFileCount(QString 
-     else if (type == "tarz") lister << KrServices::fullPathName("tar") << "-tvzf";
-     else if (type == "-tbz") lister << KrServices::fullPathName("tar") << "-tjvf";
-     else if (type == "-tlz") lister << KrServices::fullPathName("tar") << "--lzma" << "-tvf";
-+    else if (type == "-txz") lister << KrServices::fullPathName("tar") << "--xz" << "-tvf";
-     else if (type == "-lha") lister << KrServices::fullPathName("lha") << "l";
-     else if (type == "-rar") lister << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "l" << "-v";
-     else if (type == "-ace") lister << KrServices::fullPathName("unace") << "l";
-@@ -293,9 +300,11 @@ bool KRarcHandler::unpack(QString archiv
-     else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-xvzf";
-     else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-xjvf";
-     else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-xvf";
-+    else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-xvf";
-     else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-cd";
-     else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-cdk";
-     else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-cdk";
-+    else if (type == "-xz")  packer << KrServices::fullPathName("xz") << "-cdk";
-     else if (type == "-lha") packer << KrServices::fullPathName("lha") << "xf";
-     else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "-y" << "x";
-     else if (type == "-ace") packer << KrServices::fullPathName("unace") << "x";
-@@ -351,7 +360,7 @@ bool KRarcHandler::unpack(QString archiv
-     // unpack the files
-     KrLinecountingProcess proc;
-     proc << packer << archive;
--    if (type == "zip2" || type == "gzip" || type == "lzma") {
-+    if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") {
-         QString arcname = archive.mid(archive.lastIndexOf("/") + 1);
-         if (arcname.contains(".")) arcname = arcname.left(arcname.lastIndexOf("."));
-         proc.setStandardOutputFile(dest + '/' + arcname);
-@@ -407,9 +416,11 @@ bool KRarcHandler::test(QString archive,
-     else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-tvzf";
-     else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-tjvf";
-     else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-tvf";
-+    else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-tvf";
-     else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-tv";
-     else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-tv";
-     else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-tv";
-+    else if (type == "-xz")  packer << KrServices::fullPathName("xz") << "-tv";
-     else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "t";
-     else if (type == "-ace") packer << KrServices::fullPathName("unace") << "t";
-     else if (type == "-lha") packer << KrServices::fullPathName("lha") << "t";
-@@ -474,6 +485,8 @@ bool KRarcHandler::pack(QStringList file
-         packer << KrServices::fullPathName("tar") << "-cvjf"; type = "-tbz";
-     } else if (type == "tar.lzma") {
-         packer << KrServices::fullPathName("tar") << "--lzma" << "-cvf"; type = "-tlz";
-+    } else if (type == "tar.xz") {
-+        packer << KrServices::fullPathName("tar") << "--xz" << "-cvf"; type = "-txz";
-     } else if (type == "rar") {
-         packer << KrServices::fullPathName("rar") << "-r" << "a"; type = "-rar";
-     } else if (type == "lha") {
-@@ -673,6 +686,10 @@ QString KRarcHandler::getType(bool &encr
-         result = "-7z";
-     }
- 
-+    if (result.endsWith(QLatin1String("-xz"))) {
-+        result = "-xz";
-+    }
-+
-     return result.right(4);
- }
- 
-@@ -683,9 +700,9 @@ bool KRarcHandler::checkStatus(QString t
-         return exitCode == 0 || exitCode == 1;
-     else if (type == "-ace" || type == "zip2" || type == "-lha" || type == "-rpm" || type == "cpio" ||
-              type == "-tar" || type == "tarz" || type == "-tbz" || type == "-tgz" || type == "-arj" ||
--             type == "-deb" || type == "-tlz")
-+             type == "-deb" || type == "-tlz" || type == "-txz")
-         return exitCode == 0;
--    else if (type == "gzip" || type == "lzma")
-+    else if (type == "gzip" || type == "lzma" || type == "-xz")
-         return exitCode == 0 || exitCode == 2;
-     else
-         return exitCode == 0;
-@@ -707,7 +724,8 @@ QString KRarcHandler::detectArchive(bool
-         {"bzip2", 0, "\x42\x5a\x68\x39\x31" },
-         {"gzip", 0, "\x1f\x8b"},
-         {"deb",  0, "!<arch>\ndebian-binary   " },
--        {"7z",   0, "7z\xbc\xaf\x27\x1c" }
-+        {"7z",   0, "7z\xbc\xaf\x27\x1c" }/*,
-+        {"xz",   0, "\xfd\x37\x7a\x58\x5a\x00"}*/
-     };
-     static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
- 
-@@ -839,6 +857,14 @@ QString KRarcHandler::detectArchive(bool
-         return "lzma";
-     }
- 
-+    if (fileName.endsWith(QLatin1String(".tar.xz")) ||
-+            fileName.endsWith(QLatin1String(".txz"))) {
-+        return "txz";
-+    }
-+    if (fileName.endsWith(QLatin1String(".xz"))) {
-+        return "xz";
-+    }
-+
-     return QString();
- }
- 
-
---- a/krusader/defaults.h
-+++ b/krusader/defaults.h
-@@ -181,6 +181,8 @@
- #define _DoBZip2       true
- // Do LZMA ///////////
- #define _DoLZMA       true
-+// Do XZ ///////////
-+#define _DoXZ         true
- // Do Rar /////////////
- #define _DoRar         true
- // Do UnRar ///////////
-
diff --git a/extra/libfprint/50-fprint.rules b/extra/libfprint/50-fprint.rules
deleted file mode 100644
index 25feb8332..000000000
--- a/extra/libfprint/50-fprint.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-# aes1610.c
-ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1600", MODE="0664", GROUP="scanner"
-# aes2501.c
-ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2580", MODE="0664", GROUP="scanner"
-# aes4000.c
-ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="5501", MODE="0664", GROUP="scanner"
-# fdu2000.c
-ATTRS{idVendor}=="1162", ATTRS{idProduct}=="0300", MODE="0664", GROUP="scanner"
-# upektc.c
-ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2015", MODE="0664", GROUP="scanner"
-# upekts.c
-ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2016", MODE="0664", GROUP="scanner"
-# uru4000.c
-ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bb", MODE="0664", GROUP="scanner"
-ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bc", MODE="0664", GROUP="scanner"
-ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bd", MODE="0664", GROUP="scanner"
-ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00ca", MODE="0664", GROUP="scanner"
-ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0007", MODE="0664", GROUP="scanner"
-ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="000a", MODE="0664", GROUP="scanner"
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
deleted file mode 100644
index e93e6ac13..000000000
--- a/extra/libfprint/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 101410 2010-11-29 04:58:17Z allan $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=libfprint
-pkgver=0.0.6
-pkgrel=8
-pkgdesc="Library for fingerprint scanner support in applications"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://reactivated.net/fprint/wiki/Main_Page"
-license=('LGPL')
-depends=('libusb-compat' 'imagemagick' 'openssl' 'glib2')
-groups=('fprint')
-options=(!libtool)
-install=fprint.install
-source=(http://downloads.sourceforge.net/sourceforge/fprint/$pkgname-$pkgver.tar.bz2
-        50-fprint.rules)
-md5sums=('4f47b46021b186488b60aaa97f90fe43' '2c4021484509498fb17bdbe0b6d85ebf')
-sha1sums=('430af91efbefeb2b98fe30215fb33051e4f8efc5' '86e7274711226685dabf7d28f4b93dae85ffb29b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr #--enable-debug-log
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/50-fprint.rules" "$pkgdir/lib/udev/rules.d/70-fprint.rules"
-}
diff --git a/extra/libfprint/fprint.install b/extra/libfprint/fprint.install
deleted file mode 100644
index 111cb3661..000000000
--- a/extra/libfprint/fprint.install
+++ /dev/null
@@ -1,19 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-getent group scanner >/dev/null || usr/sbin/groupadd -g 96 scanner
-        /bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/extra/libreoffice/buildfix_bison25.diff b/extra/libreoffice/buildfix_bison25.diff
deleted file mode 100644
index 869b6c81e..000000000
--- a/extra/libreoffice/buildfix_bison25.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
-+++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
-@@ -4338,7 +4338,7 @@
- }
- 
- // -------------------------------------------------------------------------
--void OSQLParser::error(sal_Char *fmt)
-+void OSQLParser::error(const sal_Char *fmt)
- {
- 	if(!m_sErrorMessage.getLength())
- 	{
---- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
-+++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
-@@ -233,7 +233,7 @@
-         // returns the type for a parameter in a given function name
-         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
- 
--        void error(sal_Char *fmt);
-+        void error(const sal_Char *fmt);
-         int SQLlex();
- #ifdef YYBISON
-         void setParseTree(OSQLParseNode * pNewParseTree);
-
diff --git a/extra/libreoffice/buildfix_i116795.diff b/extra/libreoffice/buildfix_i116795.diff
deleted file mode 100644
index 8601bc164..000000000
--- a/extra/libreoffice/buildfix_i116795.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r 4ab9e11cb892 connectivity/qa/makefile.mk
---- a/connectivity/qa/makefile.mk	Thu Mar 03 15:22:23 2011 +0100
-+++ b/connectivity/qa/makefile.mk	Fri Mar 04 09:51:48 2011 +0100
-@@ -35,9 +35,16 @@
- 
- #----- compile .java files -----------------------------------------
- 
--JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
- JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
- 
-+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-+
-+.IF "$(SYSTEM_HSQLDB)" == "YES"
-+EXTRAJARFILES = $(HSQLDB_JAR)
-+.ELSE
-+JARFILES += hsqldb.jar
-+.ENDIF
-+
- #----- make a jar from compiled files ------------------------------
- 
- JARCLASSDIRS = $(PACKAGE)
-
diff --git a/extra/liferea/PKGBUILD b/extra/liferea/PKGBUILD
deleted file mode 100644
index d0c7602c7..000000000
--- a/extra/liferea/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 118815 2011-04-08 03:03:14Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=liferea
-pkgver=1.6.5
-pkgrel=3
-pkgdesc="A desktop news aggregator for online news feeds and weblogs"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://liferea.sourceforge.net/"
-license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
-            'libnotify: for notification support')
-options=('!libtool' '!emptydirs')
-install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
-        libnotify-0.7.patch)
-md5sums=('b5a2c0803eec5d0aff0b9ca4114eaf16'
-         'fca97e3316c1c51e0179c4c7dcce47a2')
-sha1sums=('f24dbd0e81c5a8309f0d19853211fc02ff818477'
-          '52e53dd11a0ffe62304c4f17e80bfe1412cfbf29')
-
-build() {
-  cd "${srcdir}/liferea-${pkgver}"
-  patch -Np1 -i "$srcdir/libnotify-0.7.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/liferea-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/liferea/libnotify-0.7.patch b/extra/liferea/libnotify-0.7.patch
deleted file mode 100644
index 6dbbffb87..000000000
--- a/extra/liferea/libnotify-0.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c
---- liferea-1.6.5/src/notification/libnotify.c	2009-06-20 20:33:19.000000000 +0200
-+++ liferea-1.6.5-libnotify/src/notification/libnotify.c	2011-03-06 23:53:45.783336455 +0100
-@@ -150,7 +150,7 @@
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -244,7 +244,7 @@
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/extra/liferea/liferea.install b/extra/liferea/liferea.install
deleted file mode 100644
index 7d812ccdb..000000000
--- a/extra/liferea/liferea.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=liferea
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 76504197a..3aeb30afa 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123080 2011-05-08 02:35:16Z foutrelis $
+# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,9 +11,9 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=2.9
-_gcc_ver=4.6.0
-pkgrel=5
-arch=('i686' 'x86_64' 'mips64el')
+_gcc_ver=4.6.1
+pkgrel=6
+arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver")
@@ -31,7 +31,7 @@ md5sums=('793138412d2af2c7c7f54615f8943771'
          '70e23a3dc2b38ecb2bb4d2c48f47295d'
          '02c23b4aaca3445b8bf39fddb2f9906e'
          '87a7162dbe99e9ffce6c40bd09f5f4f0'
-         '8da236120a9a287a977b575b8b905c93'
+         '016d70145d52255c9a46fedde51634e2'
          '225ee6b531f8327f34f344a18cb4ec81'
          '8f7582d7440e4a8342c3aea9ec714fb4'
          '047cac563a557463d7ec6bd87d953f5e')
@@ -63,7 +63,7 @@ build() {
   # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
   patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
 
-  # Add GCC 4.6.0 to GccVersions (FS#23631)
+  # Add GCC 4.6.1 to GccVersions (FS#23631)
   patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
 
   if [[ $CARCH == x86_64 ]]; then
diff --git a/extra/llvm/clang-toolchains-gcc-versions.patch b/extra/llvm/clang-toolchains-gcc-versions.patch
index 2e527300d..7e0083791 100644
--- a/extra/llvm/clang-toolchains-gcc-versions.patch
+++ b/extra/llvm/clang-toolchains-gcc-versions.patch
@@ -6,7 +6,7 @@ diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChai
    }
  
 -  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
++  const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
                                 "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
                                 "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
                                 "4.2"};
diff --git a/extra/mkvtoolnix/mkvtoolnix.install b/extra/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 1cf75e1b6..000000000
--- a/extra/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    if [ -f usr/bin/update-mime-database ]; then
-        update-mime-database usr/share/mime &> /dev/null
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    post_install $1
-}
diff --git a/extra/pam_fprint/PKGBUILD b/extra/pam_fprint/PKGBUILD
deleted file mode 100644
index 57d12c722..000000000
--- a/extra/pam_fprint/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 69402 2010-02-20 12:43:15Z allan $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=pam_fprint
-pkgver=0.2
-pkgrel=2
-pkgdesc="pam module for fingerprint authentication"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://reactivated.net/fprint/wiki/Main_Page"
-license=('LGPL')
-groups=('fprint')
-depends=('libfprint' 'pam')
-source=(http://downloads.sourceforge.net/sourceforge/fprint/$pkgname-$pkgver.tar.bz2)
-md5sums=('abfb041ed856aaac5c5c416973451226 ')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
-}
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index d612416bd..e96f2a5c8 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104670 2011-01-04 18:37:53Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
@@ -21,16 +21,17 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \
+    bindings/perl-shared/Makefile.PL
   ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl 
+    --enable-lua --enable-lua-site-install --enable-tcl
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index a3a121e0b..919693667 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124538 2011-05-22 21:23:30Z angvp $
+# $Id: PKGBUILD 129923 2011-06-29 23:05:47Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.11
-pkgrel=4
+pkgver=9.12
+pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -15,9 +15,9 @@ optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
 changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop)
-md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37'
+md5sums=('945af37d661c8c45a7cac292160e7c70'
          '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d'
+sha1sums=('4cbf0516b8304dfb041b9f3e5aaba662fee4b979'
           '962aebc88982dbeb62a7c4a051ff567e015f61a0')
 
 build() {
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 7ca04d310..9548fa5d8 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127582 2011-06-16 17:17:05Z ibiru $
+# $Id: PKGBUILD 129881 2011-06-29 11:16:17Z 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.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
 install=telepathy-gabble.install
-md5sums=('1fb19cef6cb407adbf6d3c44e8a183a2')
+md5sums=('07d927f1299dbb6bb7ca91ee9dce5d1c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch
deleted file mode 100644
index 9d8eff6bd..000000000
--- a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From be9fca9ea8cedcf879c8e0c8cea96dd256a3591c Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 12 May 2011 16:08:20 +0000
-Subject: Only make go menu action sensitive if tabs > 1 (bug #7595).
-
-This way the (default) Alt+1 keybinding is usable when
-only a single tab is opened in the terminal window.
----
-diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
-index f580a39..0d461a4 100644
---- a/terminal/terminal-window.c
-+++ b/terminal/terminal-window.c
-@@ -748,6 +748,7 @@ terminal_window_rebuild_gomenu (TerminalWindow *window)
- 
-       /* create action */
-       radio_action = gtk_radio_action_new (name, NULL, NULL, NULL, n);
-+      gtk_action_set_sensitive (GTK_ACTION (radio_action), npages > 1);
-       exo_binding_new (G_OBJECT (page), "title", G_OBJECT (radio_action), "label");
-       gtk_radio_action_set_group (radio_action, group);
-       group = gtk_radio_action_get_group (radio_action);
---
-cgit 
diff --git a/extra/tree/PKGBUILD b/extra/tree/PKGBUILD
index 353ca2688..9ae90de60 100644
--- a/extra/tree/PKGBUILD
+++ b/extra/tree/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 64859 2010-01-22 13:47:51Z giovanni $
+# $Id: PKGBUILD 129903 2011-06-29 17:46:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tree
-pkgver=1.5.3
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A directory listing program displaying a depth indented list of files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mama.indstate.edu/users/ice/tree/"
 license=('GPL')
 depends=('glibc')
-source=(ftp://mama.indstate.edu/linux/tree/${pkgname}-${pkgver}.tgz)
-md5sums=('c07ce9065667a23f27aca4de8ecccb10')
+source=("http://mama.indstate.edu/users/ice/${pkgname}/src/${pkgname}-${pkgver}.tgz")
+md5sums=('04e967a3f4108d50cde3b4b0e89e970a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make || return 1
-  make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
 }
diff --git a/extra/twisted/4771.diff b/extra/twisted/4771.diff
deleted file mode 100644
index 4e36f2632..000000000
--- a/extra/twisted/4771.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: twisted/words/protocols/jabber/jstrports.py
-===================================================================
---- twisted/words/protocols/jabber/jstrports.py (revision 30346)
-+++ twisted/words/protocols/jabber/jstrports.py (working copy)
-@@ -6,7 +6,7 @@
- """ A temporary placeholder for client-capable strports, until we
- sufficient use cases get identified """
- 
--from twisted.application import strports
-+from twisted.internet.endpoints import _parse
- 
- def _parseTCPSSL(factory, domain, port):
-     """ For the moment, parse TCP or SSL connections the same """
-@@ -22,7 +22,7 @@
- 
- 
- def parse(description, factory):
--    args, kw = strports._parse(description)
-+    args, kw = _parse(description)
-     return (args[0].upper(),) + _funcs[args[0]](factory, *args[1:], **kw)
- 
- def client(description, factory):
diff --git a/extra/windowmaker-extra/PKGBUILD b/extra/windowmaker-extra/PKGBUILD
deleted file mode 100644
index d6e88cf76..000000000
--- a/extra/windowmaker-extra/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 27783 2009-02-25 22:56:21Z eric $
-# Contributor: orelien <orelien@chez.com>
-#
-
-pkgname=windowmaker-extra
-pkgver=0.1
-pkgrel=3
-pkgdesc="Extra WindowMaker icons and themes."
-arch=(i686 x86_64 'mips64el')
-url="http://www.windowmaker.info"
-license=('GPL2')
-depends=('windowmaker')
-source=(http://www.sgiweb.org/freeware/source/windowmaker-extra/windowmaker-extra-$pkgver.tar.gz)
-md5sums=('3ef850cfe0fb6660a55ccc8a2e408f74')
-
-build() {
-  cd $srcdir/WindowMaker-extra-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  rm -f $pkgdir/usr/share/WindowMaker/Icons/xv.xpm
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 044663626..8ee55b4ba 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbasename=liferea
 pkgname=liferea-libre
-pkgver=1.6.5
-pkgrel=3
+pkgver=1.6.6b
+pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
 url="http://liferea.sourceforge.net/"
@@ -22,9 +22,9 @@ install=liferea.install
 source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
         libnotify-0.7.patch
         remove-non-free-suggestions.patch)
-md5sums=('f2d0ae5fb9f763451ba8b9fe2216de9c'
+md5sums=('3e6a113a30f8d813c3a7ece4691d5afe'
          'fca97e3316c1c51e0179c4c7dcce47a2'
-         '380284dc0b54ab9488f0659e832e59fa')
+         'e138b67a6bc62d4ba0eb64b781105bf0')
 
 # source PKGBUILD ; mksource
 mksource() {
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 0230fdb78..8d1809122 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,5 +1,5 @@
---- liferea-1.6.5/src/ui/ui_prefs.c_orig	2011-06-23 01:33:39.761555322 +0200
-+++ liferea-1.6.5/src/ui/ui_prefs.c	2011-06-23 01:38:02.121556890 +0200
+--- liferea-1.6.6b/src/ui/ui_prefs.c_orig	2011-06-23 01:33:39.761555322 +0200
++++ liferea-1.6.6b/src/ui/ui_prefs.c	2011-06-23 01:38:02.121556890 +0200
 @@ -76,24 +76,10 @@
  		NULL, NULL
  	},
diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD
index 788cda021..d25f2aae4 100644
--- a/staging/perl/PKGBUILD
+++ b/staging/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 128405 2011-06-23 21:44:26Z angvp $
+# $Id: PKGBUILD 129898 2011-06-29 17:25:10Z foutrelis $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -21,7 +21,7 @@ install=perl.install
 options=('!makeflags' '!purge')
 md5sums=('97cd306a2c22929cc141a09568f43bb0'
          '5ed2542fdb9a60682f215bd33701e61a'
-         'd76445605c49886c77734446247e439d'
+         '1f0cbbee783e8a6d32f01be5118e0d5e'
          'c25d86206d649046538c3daab7874564')
 
 build() {
diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh
index cc0d5d553..535f0b18d 100644
--- a/staging/perl/perlbin.csh
+++ b/staging/perl/perlbin.csh
@@ -4,12 +4,10 @@
 # Remove /usr/lib/perl5/*_perl/bin in next release
 
 [ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/site_perl/bin
+[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
 
 [ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/vendor_perl/bin
+[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
 
 [ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
 
diff --git a/staging/python2/PKGBUILD b/staging/python2/PKGBUILD
new file mode 100644
index 000000000..e0c363027
--- /dev/null
+++ b/staging/python2/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributer: Allan McRae <allan@archlinux.org>
+# Contributer: Jason Chu <jason@archlinux.org>
+
+pkgname=python2
+pkgver=2.7.2
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/"
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+makedepends=('tk')
+optdepends=('tk: for IDLE')
+conflicts=('python<3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
+              --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+
+  make
+}
+
+package() {
+  cd "${srcdir}/Python-${pkgver}"
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
+  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
+  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
+
+  ln -sf ../../libpython${_pybasever}.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
+
+  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
+
+  # some useful "stuff"
+  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
+  install -m755 Tools/scripts/{README,*py} \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
+
+  # fix conflicts with python
+  mv "${pkgdir}"/usr/bin/idle{,2}
+  mv "${pkgdir}"/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
+
+  # clean up #!s
+  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
+    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # clean-up reference to build directory
+  sed -i "s#${srcdir}/Python-${pkgver}:##" \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
+
+  # license
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/rasqal/PKGBUILD b/staging/rasqal/PKGBUILD
new file mode 100644
index 000000000..39d56e1cc
--- /dev/null
+++ b/staging/rasqal/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 129908 2011-06-29 19:29:04Z andrea $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Lawrence Lee <valheru@facticius.net>
+
+pkgname=rasqal
+pkgver=0.9.26
+pkgrel=1
+pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
+url="http://librdf.org/rasqal"
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+depends=('raptor>=2.0.3' 'mpfr')
+options=('!libtool')
+source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
+md5sums=('1e9fe5423498f10f636319633855e691')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--disable-static \
+	--enable-release
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD
index 32231139e..949804063 100644
--- a/staging/redland/PKGBUILD
+++ b/staging/redland/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 127594 2011-06-16 17:27:35Z andyrtr $
+# $Id: PKGBUILD 129914 2011-06-29 19:31:01Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.12
-pkgrel=2
+pkgver=1.0.13
+pkgrel=4
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
         rpath.diff)
-md5sums=('40f37a5ad97fdfbf984f78dcea0c6115'
+md5sums=('96c15f36f842ad7e1c9d225e4ca97b68'
          'acc85e784f01a656bd56777f95880787')
 
 build() {
@@ -34,9 +34,7 @@ build() {
 
 package_redland() {
  pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.21' 'raptor1' 'libtool')
- replaces=('redland-compat' 'redland-compat-devel')
- conflicts=('redland-compat' 'redland-compat-devel')
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'libtool')
  
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install
diff --git a/staging/soprano/PKGBUILD b/staging/soprano/PKGBUILD
new file mode 100644
index 000000000..4cca571cf
--- /dev/null
+++ b/staging/soprano/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 129919 2011-06-29 19:31:46Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=soprano
+pkgver=2.6.0git20110629
+pkgrel=1
+pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
+arch=('i686' 'x86_64')
+url='http://soprano.sourceforge.net/'
+license=('GPL' 'LGPL')
+depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
+makedepends=('cmake' 'openjdk6' 'doxygen')
+#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=3a7a527fd07c0d58146eb9e6770ecbcfb6717bc6&fmt=tbz2")
+md5sums=('21ef1f075062ea13d3e55d89d8f92fd2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  . /etc/profile.d/openjdk6.sh
+  # we need the rpath
+  cmake ../${pkgname} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD
deleted file mode 100644
index e063cfcaa..000000000
--- a/testing/amarok/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 127380 2011-06-14 06:48:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.1
-pkgrel=2
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package(){
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/amarok/amarok.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index 9fd24d47b..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,121 +0,0 @@
-# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.5
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        avidemux-2.5.4-x264-build115.patch)
-md5sums=('33bbe210c6826cea1987ed18a41d57a7'
-         '24a18b53a58b678b9e87d30566985751')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-
-  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
-
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \
-    -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \
-    -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'esound: for the corresponding audio device plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/testing/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;
- }
- 
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- 	return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)
- 		_param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+        return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+        if (openGopMode < 3)
-+                _param.b_open_gop = openGopMode;
-+}
- #endif
- 
- unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
deleted file mode 100644
index 790948675..000000000
--- a/testing/binutils/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.21.1
-pkgrel=1
-_date=20110627
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base')
-depends=('glibc>=2.14' 'zlib')
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('2face559e80d649ba148e42bb2d1fb0f')
-
-mksource() {
-  mkdir ${pkgname}-${_date}
-  cd ${pkgname}-${_date}
-  export _TAG=binutils-2_21-branch
-  export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
-  cvs -z9 co -r $_TAG binutils || return 1
-  mv src binutils
-  tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/*
-}
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared $CONFIGFLAG
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=${pkgdir}/usr
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  make -k -j1 check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
-  # Rebuild libiberty.a with -fPIC
-  make -C libiberty clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty
-  install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
-
-  # Rebuild libbfd.a with -fPIC
-  make -C bfd clean
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
-  install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
-  # Remove these symlinks, they are not ABI stable.
-  # Programs should compile static to the .a file.
-  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
-  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
-  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/testing/binutils/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD
deleted file mode 100644
index 48cc575e0..000000000
--- a/testing/blender/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.58
-pkgrel=1
-epoch=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff)
-  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  _svnver=36339
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 -i ../blender-ffmpeg.diff
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/testing/blender/blender.install b/testing/blender/blender.install
deleted file mode 100644
index f4d7cc443..000000000
--- a/testing/blender/blender.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/botan/PKGBUILD b/testing/botan/PKGBUILD
deleted file mode 100644
index 2d05b70e8..000000000
--- a/testing/botan/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: d'Ronin <daronin@2600.com>
-pkgname=botan
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="BSD-licensed crypto library written in C++"
-license=('BSD')
-arch=('i686' 'x86_64')
-url="http://botan.randombit.net/"
-depends=('gcc-libs' 'sh')
-makedepends=('python2')
-source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz)
-md5sums=('1f03a6a84f402a12e50665868dddae99')
-
-build() {
-  cd ${srcdir}/Botan-${pkgver}
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
-  ./configure.py --prefix=/usr
-  make 
-}
-
-package() {
-  cd ${srcdir}/Botan-${pkgver}
-  make DESTDIR=${pkgdir}/usr install
-}
-
diff --git a/testing/cronie/crontab b/testing/cronie/crontab
deleted file mode 100644
index f2ce71030..000000000
--- a/testing/cronie/crontab
+++ /dev/null
@@ -1 +0,0 @@
-# without this file, crond disables inotify support at startup
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
deleted file mode 100644
index 360802755..000000000
--- a/testing/dbus-core/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus-core
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem')
-makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
-options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
-        dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
-         '08f93dd19cffd1b45ab05c1fd4efb560')
-
-build() {
-  cd "${srcdir}/dbus-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
-      --enable-inotify --disable-dnotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-
-package(){
-  cd "${srcdir}/dbus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/bin/dbus-launch"
-  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
-
-  chown 81:81 "${pkgdir}/var/run/dbus"
-
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
-
-  #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
-
-  #install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
-}
diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus
deleted file mode 100644
index 66b84cae0..000000000
--- a/testing/dbus-core/dbus
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting D-BUS system messagebus"
-	if [ ! -x /var/run/dbus ] ; then
-	    install -m755 -g 81 -o 81 -d /var/run/dbus
-	fi
-        if [ -x /usr/bin/dbus-uuidgen ] ; then
-            /usr/bin/dbus-uuidgen --ensure
-        fi
-
-        /usr/bin/dbus-daemon --system
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/dbus.pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install
deleted file mode 100644
index 44f4475ee..000000000
--- a/testing/dbus-core/dbus.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
-}
-
-post_upgrade() {
-  post_install
-
-  #Make sure new rc script can shutdown running dbus
-  if [ -f var/run/dbus/pid ]; then
-    mv var/run/dbus/pid var/run/dbus.pid
-  fi
-}
-
-post_remove() {
-  if getent passwd dbus >/dev/null; then
-    usr/sbin/userdel dbus
-  fi
-  if getent group dbus >/dev/null; then
-    usr/sbin/groupdel dbus
-  fi
-}
diff --git a/testing/dbus-glib/PKGBUILD b/testing/dbus-glib/PKGBUILD
deleted file mode 100644
index fa15a7b85..000000000
--- a/testing/dbus-glib/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 128599 2011-06-24 13:51:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=dbus-glib
-pkgver=0.94
-pkgrel=1
-pkgdesc="GLib bindings for DBUS"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-core' 'glib2')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e1f1506a6f4941e67bffd614b1ad5af6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --enable-static=no --enable-bash-completion=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD
deleted file mode 100644
index 8cfacff43..000000000
--- a/testing/dbus-python/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=dbus-python
-pkgver=0.84.0
-pkgrel=1
-pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-glib' 'python2')
-makedepends=('pkg-config' 'docutils')
-options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fe69a2613e824463e74f10913708c88a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus
deleted file mode 100644
index 603e92d3e..000000000
--- a/testing/dbus/30-dbus
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
-fi
-
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
deleted file mode 100644
index bcac66a7a..000000000
--- a/testing/dbus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=("dbus-core>=${pkgver}" 'libx11')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        30-dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
-         'd14e59575f04e55d21a04907b6fd9f3c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
-      --disable-verbose-mode --disable-static \
-      --enable-inotify --disable-dnotify \
-      --disable-tests --disable-asserts
-  make -C tools dbus-launch
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m755 tools/dbus-launch "${pkgdir}/usr/bin/"
-  install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/"
-}
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
deleted file mode 100644
index 2d869d714..000000000
--- a/testing/fakeroot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 128934 2011-06-25 14:19:16Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=fakeroot
-pkgver=1.16
-pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://packages.debian.org/fakeroot"
-groups=('base-devel')
-install=fakeroot.install
-depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
-source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('e8470aa7e965bfc74467de0e594e60b6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
-              --disable-static --with-ipc=sysv
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-
-  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
-  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
-
-  # install README for sysv/tcp usage
-  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
deleted file mode 100644
index 986c91b06..000000000
--- a/testing/fakeroot/fakeroot.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  sbin/ldconfig -r .
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
-    sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
-  fi
-  sbin/ldconfig -r .
-}
-
-pre_remove() {
-  sbin/ldconfig -r .
-}
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index f248b5594..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 127807 2011-06-18 16:07:16Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20110618
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ff3636c6601f68cdcc777fadaf0eba46')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index cedbfa948..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,249 +0,0 @@
-# $Id: PKGBUILD 126776 2011-06-07 08:00:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.0
-pkgrel=7
-_snapshot=4.6-20110603
-_libstdcppmanver=20110201		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64.patch
-	gcc-hash-style-both.patch)
-md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49'
-         '1e9fd2eaf0ee47ea64e82c48998f1999'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libstdcxx-pch \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=('base')
-  depends=('glibc>=2.13')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libssp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21-9' 'libmpc' 'cloog' 'ppl')
-  groups=('base-devel')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index f3a040236..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,188 +0,0 @@
-# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each new glibc version
-
-pkgname=glibc
-pkgver=2.14
-pkgrel=4
-_glibcdate=20110617
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=2.6.39' 'tzdata')
-makedepends=('gcc>=4.4')
-backup=(etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.1-static-shared-getpagesize.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.13-futex.patch
-        glibc-2.14-libdl-crash.patch
-        #glibc-2.14-fix-resolver-crash-typo.patch
-        glibc-2.14-revert-4462fad3.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        nscd
-        locale.gen.txt
-        locale-gen)
-md5sums=('e441d745609d93c907b72548ba646dad'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '7d0154b7e17ea218c9fa953599d24cc4'
-         'cea62cc6b903d222c5f26e05a3c0e0e6'
-         '46e56492cccb1c9172ed3a235cf43c6c'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-
-mksource() {
-  git clone git://sourceware.org/git/glibc.git
-  pushd glibc
-  git checkout -b glibc-2.14-arch origin/release/2.14/master
-  popd
-  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-}
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
-  # using Fedora "fix" as patch in that bug report causes breakages...
-  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # This fixes the main segfault but not the assert fail (FS#24615)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
-  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
-  # resort to reverting the bad commit completely for the moment
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  fi
-
-  echo "slibdir=/lib" >> configparms
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --disable-multi-arch
-        
-  make
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  install -dm755 ${pkgdir}/etc/rc.d
-  install -dm755 ${pkgdir}/usr/sbin
-  install -dm755 ${pkgdir}/usr/lib/locale
-  install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
-  cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-  sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    # Comply with multilib binaries, they look for the linker in /lib64
-    mkdir ${pkgdir}/lib64
-    cd ${pkgdir}/lib64
-    ln -v -s ../lib/ld* .
-  fi
-  
-  # manually strip files as stripping libpthread-*.so and libthread_db.so
-  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
-  # valgrind on x86_64
-
-  cd $pkgdir
-  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-                        usr/bin/{gencat,getconf,getent,iconv,locale} \
-                        usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
-                        usr/lib/getconf/* \
-                        usr/sbin/{iconvconfig,nscd}
-  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
-  strip $STRIP_STATIC usr/lib/*.a \
-                      lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
-                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/testing/glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/testing/glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
-   assert (GLRO(dl_pagesize) != 0);
-   return GLRO(dl_pagesize);
- #else
diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/testing/glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S	
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- 	cfi_restore(%r12)
- 	retq
- 
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- 	cfi_adjust_cfa_offset(16)
- 	cfi_rel_offset(%r12, 8)
- 	cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S	
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
- 
- 7:	movq	%rdx, %rax
- 
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- 	addq	$16, %rsp
- 	cfi_adjust_cfa_offset(-16)
- 	popq	%r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- 	cfi_restore(%r12)
- 	retq
- 
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- 	cfi_adjust_cfa_offset(16)
- 	cfi_rel_offset(%r12, 8)
- 	cfi_rel_offset(%r13, 0)
diff --git a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch
deleted file mode 100644
index b5d86c7d2..000000000
--- a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index 97142b7..a001c1e 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index ee29f8c20..000000000
--- a/testing/glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- }
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch
deleted file mode 100644
index d71e37492..000000000
--- a/testing/glibc/glibc-2.14-revert-4462fad3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/testing/glibc/glibc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
-post_upgrade() {
-  sbin/ldconfig -r .
-  [ -x sbin/init ] && sbin/init u
-  usr/sbin/locale-gen
-  
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/testing/glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
-  unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
-  if [ -n "$locale" -a -n "$charset" ] ; then
-    true
-  else
-    echo "error: Bad entry '$locale $charset'"
-    false
-  fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
-	case $locale in \#*) continue;; "") continue;; esac; \
-	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
-	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
-	echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/testing/glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-#     <locale> <charset>
-#
-#  where <locale> is one of the locales given in /usr/share/i18n/locales
-#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE@euro ISO-8859-15
-#
-#  The locale-gen command will generate all the locales,
-#  placing them in /usr/lib/locale.
-#
-#  A list of supported locales is included in this file.
-#  Uncomment the ones you need.
-#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/testing/glibc/nscd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/nscd`
-case "$1" in
-  start)
-    stat_busy "Starting nscd"
-    # create necessary directories if they don't already exist
-    mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
-    # remove stale files
-    rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
-    [ -z "$PID" ] && /usr/sbin/nscd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nscd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nscd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nscd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index 958f5b0e5..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 128670 2011-06-25 12:20:55Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.9
-pkgrel=1
-pkgdesc="A string search utility"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/grep/grep.html"
-groups=('base')
-depends=('glibc' 'pcre' 'sh')
-makedepends=('texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('25e41b2aa201104354740961ef36005a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --bindir=/bin --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
deleted file mode 100644
index 7cd31301f..000000000
--- a/testing/grep/grep.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(grep.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 9f1074038..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
deleted file mode 100644
index e609c334b..000000000
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
-
-pkgname=kdeplasma-applets-networkmanagement
-epoch=1
-pkgver=git20110610
-_commit=0c83d81a374ac56538b1f6257215c81478888333
-pkgrel=1
-pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64')
-url="http://www.kde.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
-optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
-install=${pkgname}.install
-source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('23e6c100571c23b58ba557b7a28dd053')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../networkmanagement \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
deleted file mode 100644
index 36b928066..000000000
--- a/testing/less/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 128667 2011-06-25 12:14:07Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=444
-pkgrel=1
-pkgdesc="A terminal based program for viewing text files"
-license=('GPL3')
-arch=('i686' 'x86_64')
-url="http://www.greenwoodsoftware.com/less"
-groups=('base')
-depends=('ncurses' 'pcre')
-source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('56f9f76ffe13f70155f47f6b3c87d421')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}"/usr install
-  install -dm755 "${pkgdir}"/bin
-  mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin
-}
diff --git a/testing/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD
deleted file mode 100644
index 9632630d0..000000000
--- a/testing/libmtp/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb-compat')
-makedepends=('doxygen')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fd7b293436528f4c780a9da6e5cc5398')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD
deleted file mode 100644
index 0a3f8da6e..000000000
--- a/testing/linux-api-headers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 126765 2011-06-07 07:31:07Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=linux-api-headers
-pkgver=2.6.39.1
-_basever=2.6.39
-pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL2')
-provides=("kernel-headers=${pkgver}")
-conflicts=('kernel-headers')
-replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2
-	http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2)
-md5sums=('1aab7a741abe08d42e8eccf20de61e05'
-         '215f7ebaafe1175dbc5d1e439c9a96d5')
-
-build() {
-  cd ${srcdir}/linux-${_basever}
-  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver}
-
-  make mrproper
-  make headers_check
-}
-
-package() {
-  cd ${srcdir}/linux-${_basever}
-  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
-
-  # use headers from libdrm
-  rm -rf ${pkgdir}/usr/include/drm
-  
-  # clean-up unnecessary files generated during install
-  find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
-}
diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD
deleted file mode 100644
index 3aeb30afa..000000000
--- a/testing/llvm/PKGBUILD
+++ /dev/null
@@ -1,231 +0,0 @@
-# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=2.9
-_gcc_ver=4.6.1
-pkgrel=6
-arch=('i686' 'x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver")
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz
-        http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
-        ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
-        clang-plugin-loader-registry.patch
-        cindexer-clang-path.patch
-        clang-toolchains-gcc-versions.patch
-        clang-pure64.patch
-        enable-lto.patch
-        bug-9869-operator-h-c++0x.patch)
-md5sums=('793138412d2af2c7c7f54615f8943771'
-         '634de18d04b7a4ded19ec4c17d23cfca'
-         '70e23a3dc2b38ecb2bb4d2c48f47295d'
-         '02c23b4aaca3445b8bf39fddb2f9906e'
-         '87a7162dbe99e9ffce6c40bd09f5f4f0'
-         '016d70145d52255c9a46fedde51634e2'
-         '225ee6b531f8327f34f344a18cb4ec81'
-         '8f7582d7440e4a8342c3aea9ec714fb4'
-         '047cac563a557463d7ec6bd87d953f5e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # At the present, clang must reside inside the LLVM source code tree to build
-  # See http://llvm.org/bugs/show_bug.cgi?id=4840
-  rm -rf tools/clang
-  cp -r "$srcdir/clang-$pkgver" tools/clang
-
-  # Fix symbolic links from OCaml bindings to LLVM libraries
-  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
-  # Fix installation directories, ./configure doesn't seem to set them right
-  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Get the correct list of symbols to export
-  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
-  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
-  patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
-  # Add GCC 4.6.1 to GccVersions (FS#23631)
-  patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
-
-  if [[ $CARCH == x86_64 ]]; then
-    # Adjust lib paths
-    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
-  fi
-
-  # Make -flto work
-  # Use gold instead of default linker, and always use the plugin
-  patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
-
-  # Fix upstream bug #9869:
-  #   Operator.h incompatibility with GCC 4.6 in C++0x mode
-  patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  # TODO: Uncomment when clang works with GCC 4.6+
-  #_cxx_headers="/usr/include/c++/$_gcc_ver"
-  #if [[ ! -d $_cxx_headers ]]; then
-  #  error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
-  #  return 1
-  #fi
-  _cxx_headers="/usr/include/c++/clang-$pkgver"
-
-  _32bit_headers=""
-  if [[ $CARCH == x86_64 ]]; then
-    # Important for multilib
-    _32bit_headers="32"
-  fi
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-cxx-include-root=$_cxx_headers \
-    --with-cxx-include-arch=$CHOST \
-    --with-cxx-include-32bit-dir=$_32bit_headers \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package_llvm() {
-  pkgdesc="Low Level Virtual Machine"
-  depends=('perl' 'libffi')
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # We move the clang directory out of the tree so it won't get installed and
-  # then we bring it back in for the clang package
-  mv tools/clang "$srcdir"
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-  mv "$srcdir/clang" tools
-
-  # OCaml bindings go to a separate package
-  rm -rf "$srcdir"/{ocaml,ocamldoc}
-  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
-  # Remove duplicate files installed by the OCaml bindings
-  rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-ocaml() {
-  pkgdesc="OCaml bindings for LLVM"
-  depends=("llvm=$pkgver-$pkgrel" 'ocaml')
-
-  cd "$srcdir/llvm-$pkgver"
-
-  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
-  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
-  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
-  # Remove execute bit from static libraries
-  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
-  pkgdesc="C language family frontend for LLVM"
-  url="http://clang.llvm.org/"
-  # It looks like clang still needs GCC to assemble and link object files
-  # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html
-  depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver")
-
-  # Fix installation path for clang docs
-  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
-    "$srcdir/llvm-$pkgver/Makefile.config"
-
-  cd "$srcdir/llvm-$pkgver/tools/clang"
-  make DESTDIR="$pkgdir" install
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
-  # Revert the path change in case we want to do a repackage later
-  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
-    "$srcdir/llvm-$pkgver/Makefile.config"
-
-  # Install old libstdc++ headers. Contains combined headers from
-  # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64
-  install -d "$pkgdir/usr/include/c++"
-  cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
-  pkgdesc="A source code analysis framework"
-  url="http://clang-analyzer.llvm.org/"
-  depends=("clang=$pkgver-$pkgrel" 'python2')
-
-  cd "$srcdir/llvm-$pkgver/tools/clang"
-
-  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
-  for _tool in scan-{build,view}; do
-    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
-    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
-  done
-
-  # Use Python 2
-  sed -i 's/env python$/\02/' \
-    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
-    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
-  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/llvm/bug-9869-operator-h-c++0x.patch b/testing/llvm/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index b95d7d772..000000000
--- a/testing/llvm/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- llvm/trunk/include/llvm/Operator.h	2011/02/07 16:40:21	125006
-+++ llvm/trunk/include/llvm/Operator.h	2011/05/08 01:59:22	131062
-@@ -186,28 +186,46 @@
- };
- 
- class AddOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+  ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+  ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+  ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
--  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+  ~ShlOperator(); // DO NOT IMPLEMENT
-+};
- 
-   
- class SDivOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+  ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+  ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+  ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
--  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+  ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-   
-   
-   
- class GEPOperator
-   : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+  ~GEPOperator(); // DO NOT IMPLEMENT
-+
-   enum {
-     IsInBounds = (1 << 0)
-   };
diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/testing/llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/testing/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch
deleted file mode 100644
index da6178519..000000000
--- a/testing/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::arm)
-       CmdArgs.push_back("/lib/ld-linux.so.3");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1317,18 +1317,10 @@
-   if (Arch == llvm::Triple::x86)
-     Suffix64 = "/64";
- 
--  std::string Lib32 = "lib";
--
--  bool Exists;
--  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
--    Lib32 = "lib32";
--
-+  std::string Lib32 = "lib32";
-   std::string Lib64 = "lib";
--  bool Symlink;
--  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
--      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
--    Lib64 = "lib64";
- 
-+  bool Exists;
-   std::string GccTriple = "";
-   if (Arch == llvm::Triple::arm) {
-     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/testing/llvm/clang-toolchains-gcc-versions.patch b/testing/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 7e0083791..000000000
--- a/testing/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
-       GccTriple = "i586-suse-linux";
-   }
- 
--  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
-                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
-                                "4.2"};
diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch
deleted file mode 100644
index 40d93104a..000000000
--- a/testing/llvm/enable-lto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,11 +1398,11 @@
-     Lib = Lib64;
-   }
- 
--  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
-+  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
-   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
-     Linker = LinkerPath.str();
-   else
--    Linker = GetProgramPath("ld");
-+    Linker = GetProgramPath("ld.gold");
- 
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
-     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD
deleted file mode 100644
index e65f419df..000000000
--- a/testing/module-init-tools/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=module-init-tools
-pkgver=3.16
-pkgrel=1
-pkgdesc="utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64')
-url="http://kerneltools.org"
-license=('GPL')
-depends=('glibc')
-makedepends=('docbook2x')
-backup=('etc/modprobe.d/modprobe.conf')
-source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2
-        modprobe.conf
-        docfix.patch)
-md5sums=('bc44832c6e41707b8447e2847d2019f5'
-         '316f1bda4c21af02b30252eb014a0a55'
-         '4320d19902ded43bed55c804b065cdc7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix headers in SGML manpage sources and an XML typo
-  patch -Np0 < "$srcdir/docfix.patch"
-
-  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # Install our custom (read: empty) modprobe.conf
-  install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf
-}
diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch
deleted file mode 100644
index 0151ca3f1..000000000
--- a/testing/module-init-tools/docfix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
-+++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
-+++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
-@@ -52,7 +52,7 @@
-       <arg><option>-n</option></arg>
-       <arg><option>-v</option></arg>
-       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
--      <arg><option>-w</option><arg>
-+      <arg><option>-w</option></arg>
-       <arg><option><replaceable>version</replaceable></option></arg>
-       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
-     </cmdsynopsis>
---- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
-+++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
-+++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
-+++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
-+++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
-+++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf
deleted file mode 100644
index 83865a3af..000000000
--- a/testing/module-init-tools/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/modprobe.d/modprobe.conf (for v2.6 kernels)
-#
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index 3f593116a..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 128942 2011-06-25 14:51:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.0.1
-_patchlevel=p4
-pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
-pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
-url="http://www.mpfr.org/"
-license=('LGPL')
-depends=('gmp>=5.0')
-options=('!libtool')
-install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
-        mpfr-${_pkgver}.${_patchlevel}.patch)
-md5sums=('645882d9d179113a70af84d27086ed9f'
-         '52c2ac5ffbbbf0c68f08e89f016ba7aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
-  ./configure --prefix=/usr --enable-thread-safe --enable-shared
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mpfr/mpfr-3.0.1.p4.patch b/testing/mpfr/mpfr-3.0.1.p4.patch
deleted file mode 100644
index 9604635a2..000000000
--- a/testing/mpfr/mpfr-3.0.1.p4.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
-@@ -0,0 +1 @@
-+asin_exprange
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
-@@ -1 +1 @@
--3.0.1
-+3.0.1-p1
-diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
---- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -63,11 +63,14 @@
- 
-   compared = mpfr_cmp_ui (xp, 1);
- 
-+  MPFR_SAVE_EXPO_MARK (expo);
-+
-   if (MPFR_UNLIKELY (compared >= 0))
-     {
-       mpfr_clear (xp);
-       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
-         {
-+          MPFR_SAVE_EXPO_FREE (expo);
-           MPFR_SET_NAN (asin);
-           MPFR_RET_NAN;
-         }
-@@ -80,13 +83,11 @@
-               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
-               MPFR_CHANGE_SIGN (asin);
-             }
--          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
--          return inexact;
-+          mpfr_div_2ui (asin, asin, 1, rnd_mode);
-         }
-     }
--
--  MPFR_SAVE_EXPO_MARK (expo);
--
-+  else
-+    {
-   /* Compute exponent of 1 - ABS(x) */
-   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
-   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
-@@ -115,6 +116,7 @@
-   inexact = mpfr_set (asin, xp, rnd_mode);
- 
-   mpfr_clear (xp);
-+    }
- 
-   MPFR_SAVE_EXPO_FREE (expo);
-   return mpfr_check_range (asin, inexact, rnd_mode);
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1"
-+#define MPFR_VERSION_STRING "3.0.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
---- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -219,6 +219,49 @@
-   mpfr_clear (y);
- }
- 
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (1);
-+  mpfr_set_emax (1);
-+  mpfr_clear_flags ();
-+  inex = mpfr_asin (y, x, MPFR_RNDA);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
-+  ex_inex = -1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -226,6 +269,7 @@
- 
-   special ();
-   special_overflow ();
-+  reduced_expo_range ();
- 
-   test_generic (2, 100, 15);
- 
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1";
-+  return "3.0.1-p1";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
-@@ -0,0 +1 @@
-+rec_sqrt-carry
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p1
-+3.0.1-p2
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p1"
-+#define MPFR_VERSION_STRING "3.0.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
---- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
-@@ -375,20 +375,37 @@
-       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
-       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
-          we need to add or subtract the overlapping part {u + ln, un - ln} */
-+      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
-+         below (with size = th) mustn't be used. In such a case, the limb
-+         (carry) will be 0, so that this is semantically a no-op, but if
-+         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
-+         non-atomic read/write in a place that is not always allocated,
-+         with the possible consequences: a crash if the corresponding
-+         address is not mapped, or (rather unlikely) memory corruption
-+         if another process/thread writes at the same place; things may
-+         be worse with future GMP versions. Hence the tests carry != 0. */
-       if (neg == 0)
-         {
-           if (ln > 0)
-             MPN_COPY (x, u, ln);
-           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
-           /* add cu at x+un */
--          cy += mpn_add_1 (x + un, x + un, th, cu);
-+          if (cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy += mpn_add_1 (x + un, x + un, th, cu);
-+            }
-         }
-       else /* negative case */
-         {
-           /* subtract {u+ln, un-ln} from {x+ln,un} */
-           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
-           /* carry cy is at x+un, like cu */
--          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+          if (cy + cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+            }
-           /* cy cannot be zero, since the most significant bit of Xh is 1,
-              and the correction is bounded by 2^{-h+3} */
-           MPFR_ASSERTD(cy == 0);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p1";
-+  return "3.0.1-p2";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
-@@ -0,0 +1 @@
-+atan-expo-range
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p2
-+3.0.1-p3
-diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
---- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -431,5 +431,5 @@
-   MPFR_GROUP_CLEAR (group);
- 
-   MPFR_SAVE_EXPO_FREE (expo);
--  return mpfr_check_range (arctgt, inexact, rnd_mode);
-+  return mpfr_check_range (atan, inexact, rnd_mode);
- }
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p2"
-+#define MPFR_VERSION_STRING "3.0.1-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
---- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -535,6 +535,52 @@
-   mpfr_clears (a, x, y, (mpfr_ptr) 0);
- }
- 
-+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
-+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
-+ */
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (-5);
-+  mpfr_set_emax (-5);
-+  mpfr_clear_flags ();
-+  inex = mpfr_atan (y, x, MPFR_RNDN);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
-+  ex_inex = 1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -546,6 +592,7 @@
-   smallvals_atan2 ();
-   atan2_bug_20071003 ();
-   atan2_different_prec ();
-+  reduced_expo_range ();
- 
-   test_generic_atan  (2, 200, 17);
-   test_generic_atan2 (2, 200, 17);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p2";
-+  return "3.0.1-p3";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
-@@ -0,0 +1 @@
-+texp-zero
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p3
-+3.0.1-p4
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p3"
-+#define MPFR_VERSION_STRING "3.0.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
---- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
-@@ -170,7 +170,9 @@
-       mpfr_set_prec (x, prec);
-       mpfr_set_prec (y, prec);
-       mpfr_set_prec (z, prec);
--      mpfr_urandomb (x, RANDS);
-+      do
-+        mpfr_urandomb (x, RANDS);
-+      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
-       rnd = RND_RAND ();
-       mpfr_exp_2 (y, x, rnd);
-       mpfr_exp_3 (z, x, rnd);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p3";
-+  return "3.0.1-p4";
- }
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
deleted file mode 100644
index d6dd0475b..000000000
--- a/testing/mpfr/mpfr.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(mpfr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
--- 
-1.7.4.4
-
diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh
deleted file mode 100644
index cc0d5d553..000000000
--- a/testing/perl/perlbin.csh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
deleted file mode 100644
index 1783c528a..000000000
--- a/testing/psmisc/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 128514 2011-06-24 07:34:22Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=psmisc
-pkgver=22.14
-pkgrel=1
-pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
-url="http://psmisc.sourceforge.net/index.html"
-license=('GPL')
-groups=('base')
-depends=('glibc' 'ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ba3f4e971895c92bba7770d81c981503')
-sha1sums=('dc6fc0ec131c11796d01512bbd80089719b04a66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
deleted file mode 100644
index 765b76685..000000000
--- a/testing/readline/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=readline
-_basever=6.2
-_patchlevel=001 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=2
-pkgdesc="GNU readline library"
-arch=('i686' 'x86_64')
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
-license=('GPL')
-depends=('glibc' 'ncurses')
-backup=('etc/inputrc')
-options=('!emptydirs')
-install=readline.install
-source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz
-        inputrc)
-if [ $_patchlevel -gt 00 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p))
-    done
-fi
-md5sums=('67948acb2ca081f23359d0256e9a271c'
-         '58d54966c1191db45973cb3191ac621a'
-         '83287d52a482f790dfb30ec0a8746669')
-
-build() {
-  cd ${srcdir}/${pkgname}-$_basever
-  for p in ../readline${_basever//./}-*; do
-    [ -e "$p" ] || continue
-    msg "applying patch ${p}"
-    patch -Np0 -i ${p}
-  done
-
-  # Remove RPATH from shared objects (FS#14366)
-  sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
-
-  # build with -fPIC for x86_64 (FS#15634)
-  [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
-
-  ./configure --prefix=/usr --libdir=/lib
-  make SHLIB_LIBS=-lncurses
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-
-  # FHS recommends only shared libs in /lib
-  install -dm755 $pkgdir/usr/lib
-  mv $pkgdir/lib/*.a $pkgdir/usr/lib
-
-  # to make the linker find the shared lib and fix compile issues
-  cd ${pkgdir}/usr/lib
-  ln -sv /lib/libreadline.so .
-  ln -sv /lib/libhistory.so .
-}
diff --git a/testing/readline/inputrc b/testing/readline/inputrc
deleted file mode 100644
index fd13a673b..000000000
--- a/testing/readline/inputrc
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not bell on tab-completion
-#set bell-style none
-
-set meta-flag on
-set input-meta on
-set convert-meta off
-set output-meta on
-
-$if mode=emacs
-
-# for linux console and RH/Debian xterm
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[7~": beginning-of-line
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-"\e[5C": forward-word
-"\e[5D": backward-word
-"\e\e[C": forward-word
-"\e\e[D": backward-word
-"\e[1;5C": forward-word
-"\e[1;5D": backward-word
-
-# for rxvt
-"\e[8~": end-of-line
-
-# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for freebsd console
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-$endif
diff --git a/testing/readline/readline.install b/testing/readline/readline.install
deleted file mode 100644
index 06b646f23..000000000
--- a/testing/readline/readline.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(history.info readline.info rluserman.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
deleted file mode 100644
index a1644664b..000000000
--- a/testing/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.90.1.git20110610
-pkgrel=2
-pkgdesc="An iTunes-like music player/libary"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
-         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs' '!strip')
-install=rhythmbox.install
-#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export CFLAGS="$CFLAGS -g -O1"
-  export CXXFLAGS="$CXXFLAGS -g -O1"
-  PYTHON=/usr/bin/python2 ./autogen.sh
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python \
-      --with-mdns=avahi --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
deleted file mode 100644
index cbea0e6b3..000000000
--- a/testing/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=rhythmbox
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-     if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-         usr/sbin/gconfpkg --uninstall ${pkgname}
-     fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD
deleted file mode 100644
index 8c95ca2d4..000000000
--- a/testing/rrdtool/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=rrdtool
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org"
-license=('GPL' 'custom')
-depends=('libpng' 'libxml2' 'pango' 'tcp_wrappers')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
-optdepends=('tcl: to use corresponding binding' \
-            'python2: to use corresponding binding' \
-            'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-md5sums=('4d116dba9a0888d8aaac179e35d3980a')
-sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \
-    bindings/perl-shared/Makefile.PL
-  ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
-    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
-    --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index b3a130166..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.4.3
-pkgrel=2
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
-        etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
-        etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
-        etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
-        etc/default/useradd)
-options=('!libtool')
-install=shadow.install
-#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2
-# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied
-source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
-        adduser chgpasswd chpasswd defaults.pam login login.defs newusers
-        passwd shadow.cron.daily useradd.defaults LICENSE
-        xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch
-        shadow-add-missing-include.patch)
-sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
-          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
-          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
-          'd66096ed9477bd7242e8d2cc28eaa23170269788'
-          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
-          'd66096ed9477bd7242e8d2cc28eaa23170269788'
-          '6f183bc7709b0a8d20ad17481a4ad025cf6e5056'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
-          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '6bfe6528391eb38d338beacedd620407877b637d'
-          '9db9e62ad173f31e1039121c0124cf60826ffd7e'
-          '0697a21f7519de30821da7772677035652df4ad2')
-
-build() {
-  cd "$srcdir/$pkgname-4.1.4.2+svn3283"
-
-  #Ugh, force this to build shared libraries, for god's sake
-  sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am
-  libtoolize
-  autoreconf
-  export LDFLAGS="$LDFLAGS -lcrypt"
-
-  patch -p1 -i "$srcdir/xstrdup.patch"
-  patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch"
-  patch -p1 -i "$srcdir/shadow-strncpy-usage.patch"
-  patch -p1 -i "$srcdir/shadow-add-missing-include.patch"
-
-  # supress etc/pam.d/*, we provide our own
-  sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
-  ./configure \
-    --prefix=/usr --libdir=/lib \
-    --mandir=/usr/share/man --sysconfdir=/etc \
-    --enable-shared --disable-static \
-    --with-libpam --without-selinux
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-4.1.4.2+svn3283"
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
-  # interactive useradd
-  install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
-  # useradd defaults
-  install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
-  # cron job
-  install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
-  # login.defs
-  install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
-  # PAM config - custom
-  install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login"
-  install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd"
-  install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd"
-  install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd"
-  install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers"
-  # PAM config - from tarball
-  install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
-  # we use the 'useradd' PAM file for other similar utilities
-  for file in chage chfn chsh groupadd groupdel groupmod shadow \
-      useradd usermod userdel; do
-    install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
-  done
-
-  # Remove su - using su from coreutils instead
-  rm "$pkgdir/bin/su"
-  find "$pkgdir/usr/share/man" -name 'su.1' -delete
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995  Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
-# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-#          Based on the original Slackware adduser by Hrvoje Dogan
-#          with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04 
-#       * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-#       * Disallow user names that begin with a numeric because useradd 
-#         (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-#       * When supplying a null string for the uid (meaning 'Choose next available'), 
-#         if there were file names in the range 'a-z' in the pwd then the 
-#         egrep command considered these files rather than the null string. 
-#         The egrep expression is now in quotes.  
-#         Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-#       * Ask to chown user.group the home directory if it already exists.
-#         This helps reduce later confusion when adding users whose home dir
-#         already exists (mounted partition for example) and is owned
-#         by a user other than the user to which the directory is being
-#         assigned as home.  Default is not to chown.
-#         Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-#       * Advise & prevent users from creating logins with '.' characters
-#         in the user name. <sw>
-#       * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
-#         will let you create a user that has any uppercase chars in it
-#         This was reported on the userlocal.org forums
-#         by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-#       * Support 'broken' (null lines in) /etc/passwd and 
-#         /etc/group files <sw>       
-#       * For recycling UIDs (default still 'off'), we now look in 
-#         /etc/login.defs for the UID_MIN value and use it
-#         If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-#       * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-#       * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-#       * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
-   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid.  I like the idea of 
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() { 
-  local output
-  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
-    echo -n "${1} " >&2 # fudge for use with bash v1
-    read output
-  else # this should work with any other /bin/sh
-    read -ep "${1} " output
-  fi
-  echo $output
-}
-
-# Function to display the account info
-function display () {
-  local goose
-  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
-  echo -n "$1 "
-  # If it's null then display the 'other' information
-  if [ -z "$goose" -a ! -z "$3" ]; then 
-    echo "$3" 
-  else 
-    echo "$goose" 
-  fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
-  local got_error group
-  if [ ! -z "$@" ]; then  
-  for group in $@ ; do
-    local uid_not_named="" uid_not_num=""
-    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
-    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
-    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
-      echo "- Group '$group' does not exist"
-      got_error=yes
-    fi
-  done
-  fi
-  # Return exit code of 1 if at least one of the groups didn't exist
-  if [ ! -z "$got_error" ]; then
-    return 1
-  fi
-}   
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
-  if [ -z "$LOGIN" ]; then 
-    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
-  fi
-  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
-  if [ $? -eq 0 ]; then
-    echo "- User '$LOGIN' already exists; please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
-    echo "- User names cannot begin with a number; please choose another"
-    unset LOGIN
-  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
-    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
-    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
-    unset LOGIN
-  else
-    unset needinput
-  fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
-  echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd 
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
-  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    echo "- That UID is already in use; please choose another"
-  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
-    echo "- UIDs are numerics only"         
-  else
-    unset needinput
-  fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then 
-  U_ID="-u ${_UID}"
-else
-  # Will we be recycling UIDs?
-  if [ "$recycleuids" = "yes" ]; then
-    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
-  fi   
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number 
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  GID="$(get_input "Initial group [ ${defgroup} ]:")"
-  check_group "$GID"
-  if [ $? -gt 0 ]; then
-    echo "- Please choose another"
-  else
-    unset needinput 
-  fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
-  GID="-g ${defgroup}"
-else
-  GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  AGID="$(get_input "Additional groups (comma separated) []:")"
-  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
-  if [ ! -z "$AGID" ]; then
-    check_group "$AGID"  # check all groups at once (treated as N # of params)
-    if [ $? -gt 0 ]; then
-      echo "- Please re-enter the group(s)"
-    else
-      unset needinput # we found all groups specified
-      AGID="-G $(echo "$AGID" | tr ' ' ,)"
-    fi
-  else
-    unset needinput   # we don't *have* to have additional groups
-  fi
-done
-
-#: Get the new user's home dir :#
-#       
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
-  if [ -z "$HME" ]; then
-    HME="${defhome}/${LOGIN}"
-  fi 
-  # Warn the user if the home dir already exists
-  if [ -d "$HME" ]; then
-    echo "- Warning: '$HME' already exists !"
-    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
-      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
-      if [ "$(echo $getyn | grep -i "y")" ]; then
-         CHOWNHOMEDIR=$HME # set this to the home directory
-      fi
-    fi
-  else
-    unset needinput
-  fi
-done           
-HME="-d ${HME}"  
-    
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  unset got_error
-  SHL="$(get_input "Shell [ ${defshell} ]")"
-  if [ -z "$SHL" ]; then
-    SHL="${defshell}"
-  fi 
-  # Warn the user if the shell doesn't exist in /etc/shells or as a file
-  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
-    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
-    got_error=yes
-  fi
-  if [ ! -f "$SHL" ]; then
-    echo "- Warning: ${SHL} does not exist as a file"
-    got_error=yes
-  fi
-  if [ ! -z "$got_error" ]; then
-    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-    fi
-  else
-    unset needinput
-  fi
-done           
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
-  if [ ! -z "$EXP" ]; then
-    # Check to see whether the expiry date is in the valid format
-    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
-      echo "- That is not a valid expiration date"
-    else
-      unset needinput 
-      EXP="-e ${EXP}" 
-    fi
-  else
-    unset needinput
-  fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
-  echo "- Error running useradd command -- account not created!"
-  echo "(cmd: $CMD)"
-  exit 1
-fi
-
-# chown the home dir ?  We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
-  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "* WARNING: An error occured while setting the password for"
-  echo "           this account.  Please manually investigate this *"
-  exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-account		required	pam_permit.so
-password	include		system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index bc14857dc..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so md5 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/shadow/login b/testing/shadow/login
deleted file mode 100644
index 51ff96a4a..000000000
--- a/testing/shadow/login
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth		required	pam_securetty.so
-auth		requisite	pam_nologin.so
-auth		required	pam_unix.so nullok
-auth		required	pam_tally.so onerr=succeed file=/var/log/faillog
-# use this to lockout accounts for 10 minutes after 3 failed attempts
-#auth		required	pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog
-account		required	pam_access.so
-account		required	pam_time.so
-account		required	pam_unix.so
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so md5 shadow use_authtok
-session		required	pam_unix.so
-session		required	pam_env.so
-session		required	pam_motd.so
-session		required	pam_limits.so
-session		optional	pam_mail.so dir=/var/spool/mail standard
-session		optional	pam_lastlog.so
-session		optional	pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY		3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# *REQUIRED*
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-UMASK		077
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-# System accounts
-SYS_UID_MIN		  500
-SYS_UID_MAX		  999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			 1000
-GID_MAX			60000
-# System accounts
-SYS_GID_MIN		  500
-SYS_GID_MAX		  999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index bc14857dc..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so md5 shadow
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index 1ffd1bdd8..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so md5 shadow use_authtok
-password	required	pam_unix.so md5 shadow nullok
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index c1bd1066b..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_upgrade() {
-  grpck -r &>/dev/null
-  if [ $? -eq 2 ]; then
-    echo "Fixing gshadow file ..."
-    while :; do echo "y"; done | grpck &>/dev/null
-  fi
-  return 0
-}
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD
deleted file mode 100644
index c54007652..000000000
--- a/testing/syslog-ng/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=syslog-ng
-pkgver=3.2.4
-pkgrel=2
-pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk')
-makedepends=('flex' 'pkg-config')
-optdepends=('logrotate: for rotating log files')
-provides=('logger')
-options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
-        'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz
-        non-blocking-systemd-fds.patch
-        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch)
-md5sums=('5995f7dad0053a478b60a63f6f754203'
-         '25e43afe51eb2223c25168e3c3e7aaf6'
-         '344dddfff946300f5576b13a7e8ea19f'
-         '735636090be4582885974542d2a75855'
-         '8b4441343d859c2f01c2cf799a7e6f98'
-         '46e5dcff71f820d497898331a3f608fe')
-sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
-          '73b83deae9a8b945dfb13adf331e6bf6f119b83e'
-          'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'
-          'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-          '4481819762fd1b6f25903016a8878e63c0058fcb'
-          'f093a09626a528d23f0f2aeece018cab15a735a9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix #22555 for kernels >=2.6.38
-  patch -p1 -i ../cap_syslog.patch
-
-  # fix systemd blocking FD bug
-  # https://bugzilla.balabit.com/show_bug.cgi?id=125
-  patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
-    --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
-    --enable-tcp-wrapper \
-    --with-pidfile-dir=/var/run \
-    --disable-spoof-source \
-    --enable-systemd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d"
-  install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf"
-  install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng"
-  install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng"
-  install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service"
-}
diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch
deleted file mode 100644
index b6e6db6e4..000000000
--- a/testing/syslog-ng/cap_syslog.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/lib/gprocess.h b/lib/gprocess.h
-index cda35b0..5c449f7 100644
---- a/lib/gprocess.h
-+++ b/lib/gprocess.h
-@@ -28,9 +28,14 @@
- #include "syslog-ng.h"
- 
- #include <sys/types.h>
-+#include <sys/utsname.h>
- 
- #if ENABLE_LINUX_CAPS
- #  include <sys/capability.h>
-+#
-+#  ifndef CAP_SYSLOG
-+#    define CAP_SYSLOG 34
-+#  endif
- #endif
- 
- typedef enum
-@@ -78,5 +83,8 @@ void g_process_finish(void);
- 
- void g_process_add_option_group(GOptionContext *ctx);
- 
-+extern int kernel_version;
-+extern void get_kernel_version(void);
-+#define LINUX_VERSION(x,y,z)    (0x10000*(x) + 0x100*(y) + z)
- 
- #endif
-diff --git a/modules/affile/affile.c b/modules/affile/affile.c
-index e145324..886fa72 100644
---- a/modules/affile/affile.c
-+++ b/modules/affile/affile.c
-@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags,
-   if (privileged)
-     {
-       g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE);
--      g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
-+      if (!kernel_version)
-+        get_kernel_version();
-+      if (kernel_version < LINUX_VERSION(2, 6, 38))
-+        g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
-+      else
-+        g_process_cap_modify(CAP_SYSLOG, TRUE);
-     }
-   else
-     {
-diff --git a/syslog-ng/main.c b/syslog-ng/main.c
-index 9880c1f..ee5031b 100644
---- a/syslog-ng/main.c
-+++ b/syslog-ng/main.c
-@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE;
- static gboolean display_version = FALSE;
- static gchar *ctlfilename = PATH_CONTROL_SOCKET;
- static gchar *preprocess_into = NULL;
-+int kernel_version;
- 
- static volatile sig_atomic_t sig_hup_received = FALSE;
- static volatile sig_atomic_t sig_term_received = FALSE;
-@@ -363,6 +364,20 @@ version(void)
-          ON_OFF_STR(ENABLE_PACCT_MODULE));
- }
- 
-+void
-+get_kernel_version(void) {
-+	static struct utsname uts;
-+	int x = 0, y = 0, z = 0;
-+
-+	if (uname(&uts) == -1) {
-+		fprintf(stderr, "Unable to retrieve kernel version.\n");
-+		exit(1);
-+	}
-+
-+	sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
-+	kernel_version = LINUX_VERSION(x, y, z);
-+}
-+
- int 
- main(int argc, char *argv[])
- {
-@@ -379,9 +394,20 @@ main(int argc, char *argv[])
-    * indicate readability. Enabling/disabling cap_sys_admin on every poll
-    * invocation seems to be too expensive. So I enable it for now. */
-   
--  g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
-+  if (!kernel_version)
-+    get_kernel_version();
-+  if (kernel_version < LINUX_VERSION(2, 6, 34))
-+    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
-                      "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p "
-                      "cap_sys_admin=ep");
-+  else if (kernel_version < LINUX_VERSION(2, 6, 38))
-+    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
-+                     "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
-+                     "cap_sys_admin=p");
-+  else
-+    g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
-+                     "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
-+                     "cap_syslog=p");
-   ctx = g_option_context_new("syslog-ng");
-   g_process_add_option_group(ctx);
-   msg_add_option_group(ctx);
diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf
deleted file mode 100644
index 6e3362681..000000000
--- a/testing/syslog-ng/syslog-ng.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-@version: 3.2
-#
-# /etc/syslog-ng/syslog-ng.conf
-#
-
-options {
-  stats_freq (0);
-  flush_lines (0);
-  time_reopen (10);
-  log_fifo_size (1000);
-  long_hostnames(off); 
-  use_dns (no);
-  use_fqdn (no);
-  create_dirs (no);
-  keep_hostname (yes);
-  perm(0640);
-  group("log");
-};
-
-source src {
-  unix-dgram("/dev/log");
-  internal();
-  file("/proc/kmsg");
-};
-
-destination d_authlog { file("/var/log/auth.log"); };
-destination d_syslog { file("/var/log/syslog.log"); };
-destination d_cron { file("/var/log/crond.log"); };
-destination d_daemon { file("/var/log/daemon.log"); };
-destination d_kernel { file("/var/log/kernel.log"); };
-destination d_lpr { file("/var/log/lpr.log"); };
-destination d_user { file("/var/log/user.log"); };
-destination d_uucp { file("/var/log/uucp.log"); };
-destination d_mail { file("/var/log/mail.log"); };
-destination d_news { file("/var/log/news.log"); };
-destination d_ppp { file("/var/log/ppp.log"); };
-destination d_debug { file("/var/log/debug.log"); };
-destination d_messages { file("/var/log/messages.log"); };
-destination d_errors { file("/var/log/errors.log"); };
-destination d_everything { file("/var/log/everything.log"); };
-destination d_iptables { file("/var/log/iptables.log"); };
-destination d_acpid { file("/var/log/acpid.log"); };
-destination d_console { usertty("root"); };
-
-# Log everything to tty12
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { program(syslog-ng); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern) and not filter(f_iptables); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_news { facility(news); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-filter f_ppp { facility(local2); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
-filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-filter f_emergency { level(emerg); };
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
-filter f_acpid { program("acpid"); };
-
-log { source(src); filter(f_acpid); destination(d_acpid); };
-log { source(src); filter(f_authpriv); destination(d_authlog); };
-log { source(src); filter(f_syslog); destination(d_syslog); };
-log { source(src); filter(f_cron); destination(d_cron); };
-log { source(src); filter(f_daemon); destination(d_daemon); };
-log { source(src); filter(f_kernel); destination(d_kernel); };
-log { source(src); filter(f_lpr); destination(d_lpr); };
-log { source(src); filter(f_mail); destination(d_mail); };
-log { source(src); filter(f_news); destination(d_news); };
-log { source(src); filter(f_ppp); destination(d_ppp); };
-log { source(src); filter(f_user); destination(d_user); };
-log { source(src); filter(f_uucp); destination(d_uucp); };
-#log { source(src); filter(f_debug); destination(d_debug); };
-log { source(src); filter(f_messages); destination(d_messages); };
-log { source(src); filter(f_err); destination(d_errors); };
-log { source(src); filter(f_emergency); destination(d_console); };
-log { source(src); filter(f_everything); destination(d_everything); };
-log { source(src); filter(f_iptables); destination(d_iptables); };
-
-# Log everything to tty12
-#log { source(src); destination(console_all); };
diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate
deleted file mode 100644
index e0e6929f2..000000000
--- a/testing/syslog-ng/syslog-ng.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
-	missingok
-	sharedscripts
-	postrotate
-		/bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null`  2> /dev/null || true
-	endscript
-}
diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc
deleted file mode 100755
index bb5320b2c..000000000
--- a/testing/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-checkconfig() {
-    syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
-    if [ $? -gt 0 ]; then
-	stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)."
-	stat_fail
-        exit 0
-    fi
-}
-
-PID=`pidof -o %PPID /usr/sbin/syslog-ng`
-case "$1" in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    [ -z "$PID" ] && /usr/sbin/syslog-ng
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/syslog-ng.pid
-#     Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/
-      rm -f /var/syslog-ng.persist
-      rm_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      checkconfig
-      kill -HUP $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"  
-esac
-exit 0
diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD
deleted file mode 100644
index d25475b8d..000000000
--- a/testing/twisted/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 126682 2011-06-06 14:53:30Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=11.0.0
-pkgrel=1
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2' 'pycrypto' 'zope-interface')
-optdepends=('python2-pyopenssl'
-            'python-soappy:for twisted.web.soap')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
-md5sums=('d7f94a1609a1b8f3b8c8d0146d4cfe54')
-
-build() {
-    cd "${srcdir}/Twisted-${pkgver}"
-    python2 setup.py build
-}
-
-package() {
-    cd "${srcdir}/Twisted-${pkgver}"
-    python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
-    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
-}
diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/testing/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
deleted file mode 100644
index a181f374c..000000000
--- a/testing/valgrind/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 126782 2011-06-07 10:02:00Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
-depends=('glibc>=2.14' 'glibc<2.15' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.6.1-glibc-2.14.patch
-        glibc-patch-version.patch)    
-md5sums=('2c3aa122498baecc9d69194057ca88f5'
-         '560032ce5d27ef0c7c1af32c3fd45833'
-         'b657f0ebdde3d9aefc9fd16f9e653702')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # make sure our CFLAGS are respected
-  sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
-
-  # glibc-2.14 compatibility
-  patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch
-
-  # prevent need to rebuild with glibc patch level version bumps
-  patch -Np1 -i ${srcdir}/glibc-patch-version.patch
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man
-  fi
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/valgrind/glibc-patch-version.patch b/testing/valgrind/glibc-patch-version.patch
deleted file mode 100644
index 2c6830aef..000000000
--- a/testing/valgrind/glibc-patch-version.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Saves having to rebuild valgrind on glibc-x.x.* patch level releases
-
-diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in
---- valgrind-3.5.0-old//glibc-2.X.supp.in	2009-08-19 23:37:48.000000000 +1000
-+++ valgrind-3.5.0/glibc-2.X.supp.in	2010-05-22 19:43:08.088007038 +1000
-@@ -168,9 +168,9 @@
-    Memcheck:Param
-    socketcall.sendto(msg)
-    fun:__sendto_nocancel
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
-    glibc24-64bit-padding-1c
-@@ -180,7 +180,7 @@
-    fun:__nscd_get_map_ref
-    fun:nscd_get*_r
-    fun:*nscd*
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- 
- 
-@@ -199,18 +199,18 @@
-    Memcheck:Param
-    socketcall.sendto(msg)
-    fun:send
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
-    X11-64bit-padding-4b
-    Memcheck:Param
-    socketcall.send(msg)
-    fun:send
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
--   obj:/*libc-@GLIBC_VERSION@.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
-+   obj:/*libc-@GLIBC_VERSION@*.so
- }
- 
- ##----------------------------------------------------------------------##
diff --git a/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch b/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch
deleted file mode 100644
index 7fd217016..000000000
--- a/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- valgrind/configure.in.jj	2010-10-21 03:14:02.000000000 +0200
-+++ valgrind/configure.in	2010-11-05 17:09:18.674455299 +0100
-@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.14)
-+	AC_MSG_RESULT(2.14 family)
-+	AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      aix5)
- 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in
- 
-      *)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
- 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
---- valgrind/config.h.in.jj	2010-10-20 22:20:49.000000000 +0200
-+++ valgrind/config.h.in	2010-11-05 17:08:33.863454886 +0100
-@@ -33,6 +33,9 @@
- /* Define to 1 if you're using glibc 2.13.x */
- #undef GLIBC_2_13
- 
-+/* Define to 1 if you're using glibc 2.14.x */
-+#undef GLIBC_2_14
-+
- /* Define to 1 if you're using glibc 2.2.x */
- #undef GLIBC_2_2
- 
---- valgrind/configure.jj	2010-10-21 03:16:18.000000000 +0200
-+++ valgrind/configure	2010-11-05 17:09:39.163455396 +0100
-@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.14)
-+	echo "$as_me:$LINENO: result: 2.14 family" >&5
-+echo "${ECHO_T}2.14 family" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define GLIBC_2_14 1
-+_ACEOF
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      aix5)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5
- $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; }
-@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
- 	as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index 95361e280..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.10
-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' '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' 'libxpm' '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')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('066cb94b1e3aa848d828121354d6be4d')
-
-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/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index 4a1091bc5..000000000
--- a/testing/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index 90508716e..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20110617
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('928717aa2f0c7ca91e589d6b60e688f1')
-
-build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
-
-    ./configure --enable-shared
-
-    make
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-07-01 19:40:51 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-07-01 19:40:51 -0300
commit	3dc4525661db2630038e019a2a31b71fdcbfb74a (patch)
tree	ea19d09158589c89b949b8cc80d5cd61f8d5b64e
parent	e41246bc4c78478a71fe801a745210c931c5f2c5 (diff)
parent	76400556d9e8a5dedc692487c13b76a541813a23 (diff)