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

Conflicts: community/alienarena/PKGBUILD community/mumble/PKGBUILD community/mysql-workbench/PKGBUILD community/paintown/PKGBUILD community/ufoai/PKGBUILD core/dcron/PKGBUILD core/udev/PKGBUILD extra/qt/PKGBUILD extra/texlive-bin/PKGBUILD testing/opencv/PKGBUILD testing/pciutils/PKGBUILD testing/usbutils/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-05-05 16:07:43 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-05-05 16:07:43 -0300
commit: 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch)
tree: 175c9e1755980b2a955b1b9e6b93c1a3d431276f
parent: 933e5d274b2a4e386565d2f3bb982682e168438b (diff)
parent: 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff)
158 files changed, 1742 insertions, 3529 deletions
diff --git a/community-staging/gimmie/ChangeLog b/community-staging/gimmie/ChangeLog
new file mode 100644
index 000000000..7fd5bbf99
--- /dev/null
+++ b/community-staging/gimmie/ChangeLog
@@ -0,0 +1,2 @@
+2007-06-26 tardo <tardo@nagi-fanboi.net>
+* Built for x86_64
diff --git a/community-staging/gimmie/PKGBUILD b/community-staging/gimmie/PKGBUILD
new file mode 100644
index 000000000..601d39576
--- /dev/null
+++ b/community-staging/gimmie/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=gimmie
+pkgver=0.2.8
+pkgrel=16
+pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc"
+arch=('i686' 'x86_64')
+url="http://beatniksoftware.com/gimmie/"
+license=('LGPL')
+depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet'
+	 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg'
+	 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('findutils' 'perlxml' 'krb5')
+options=(!libtool)
+install=$pkgname.install
+source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('721b8ec80f0247e1281aeb4aa5614c2f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py
+
+  export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`"
+  export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`"
+
+  export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`"
+  export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
+
+  export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`"
+  export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \
+              --disable-static --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+              PYTHON=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community-staging/gimmie/gimmie.install b/community-staging/gimmie/gimmie.install
new file mode 100644
index 000000000..015be0a4d
--- /dev/null
+++ b/community-staging/gimmie/gimmie.install
@@ -0,0 +1,22 @@
+pkgname=gimmie
+
+post_install() {
+  gconfpkg --install $pkgname
+  xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate
+}
diff --git a/community/alienarena/PKGBUILD b/community/alienarena/PKGBUILD
deleted file mode 100644
index e6d37d2c3..000000000
--- a/community/alienarena/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 42056 2011-03-12 16:13:26Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: yugrotavele <yugrotavele at archlinux dot us>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: godane <slaxemulator@gmail.com>
-# Contributor: damian01w <damian01w@gmail.com>
-
-pkgname=alienarena
-pkgver=7.51
-pkgrel=1
-_verdate=20110311
-pkgdesc="Multiplayer retro sci-fi deathmatch game"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://icculus.org/alienarena/rpa/'
-license=('GPL')
-depends=('curl' 'freetype2' 'libgl' 'libjpeg' 'libvorbis' 'libxxf86dga' 'libxxf86vm' 'mesa' 'ode' 'sdl' 'openal' 'alienarena-data')
-source=(http://icculus.org/alienarena/Files/alienarena-${pkgver/./_}-linux${_verdate}.tar.gz
-	'alienarena.desktop')
-md5sums=('c9f1f050f52cdc45ab85487c526518d8'
-         'f9b50e27e8615a6010b4cc91e9eb010f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  mv -f "$pkgdir/usr/bin/crx" "$pkgdir/usr/bin/$pkgname"
-  mv -f "$pkgdir/usr/bin/crx-ded" "$pkgdir/usr/bin/$pkgname-ded"
-  install -D -m644 "$srcdir/alienarena.desktop" "${pkgdir}/usr/share/applications/alienarena.desktop"
-  rm -rf "$pkgdir/usr/share/$pkgname"
-}
diff --git a/community/alienarena/alienarena.desktop b/community/alienarena/alienarena.desktop
deleted file mode 100644
index d0b9834ed..000000000
--- a/community/alienarena/alienarena.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Alien Arena
-Comment=Multiplayer retro sci-fi deathmatch
-Exec=alienarena
-Icon=/usr/share/alienarena/aa.png
-Categories=Game;ActionGame;
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 0bf9cc75a..47f19f0ed 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=57516
+pkgver=59120
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-extra-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('e-svn' 'libxkbfile' 'emprint-svn' 'libmpd' 'hal' 'efreet-svn' 'e_dbus-svn')
+depends=('e-svn' 'libxkbfile' 'emprint-svn' 'libmpd' 'efreet-svn' 'e_dbus-svn')
 makedepends=('subversion')
 conflicts=('e-modules-extra')
 provides=('e-modules-extra')
@@ -40,10 +40,11 @@ build() {
   sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1
 
 # weather fails to compile on September 7th 2010
-for i in alarm calendar cpu deskshow diskio efm_path efm_pathbar efm_nav\
-	empris eooorg everything-mpris everything-pidgin everything-places everything-tracker \
-	everything-wallpaper everything-websearch  \
-        execwatch flame forecasts iiirk itask itask-ng language mail mem \
+# xkbswitch fails to compile on May 4th 2011
+for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\
+	empris engage eooorg everything-mpris everything-pidgin everything-places \
+	everything-tracker everything-wallpaper everything-websearch  \
+        execwatch flame forecasts iiirk itask language mail mem \
         moon mpdule net news notification penguins photo places quickaccess \
 	rain screenshot slideshow snow taskbar tclock tiling uptime \
 	winlist-ng winselector wlan; do
@@ -59,10 +60,10 @@ package() {
   cd $srcdir/$_svnmod-build
 
 # weather fails to compile on September 7th 2010
-for i in alarm calendar cpu deskshow diskio efm_path efm_pathbar efm_nav\
-        empris eooorg everything-mpris everything-pidgin everything-places everything-tracker \
-        everything-wallpaper everything-websearch  \
-        execwatch flame forecasts iiirk itask itask-ng language mail mem \
+for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\
+        empris engage eooorg everything-mpris everything-pidgin everything-places \
+	everything-tracker everything-wallpaper everything-websearch  \
+        execwatch flame forecasts iiirk itask language mail mem \
         moon mpdule net news notification penguins photo places quickaccess \
         rain screenshot slideshow snow taskbar tclock tiling uptime \
         winlist-ng winselector wlan; do
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 76d8a2b72..a96fb8ae1 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41234 2011-03-04 22:18:13Z rvanharen $
+# $Id: PKGBUILD 46198 2011-05-04 10:12:25Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-svn
-pkgver=57517
+pkgver=58940
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,9 +17,8 @@ conflicts=('e')
 provides=('e')
 backup=('etc/enlightenment/sysactions.conf')
 options=('!libtool')
-source=('e-applications.menu' 'sysactions.patch')
-sha1sums=('e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
-          '1bbe1bb1ba8c10098c3c30dc5a97734158abb2c7')
+source=('e-applications.menu')
+sha1sums=('e08cc63cb8a188a06705b42d03e032b9fcfa7ee5')
 
 _svntrunk="http://svn.enlightenment.org/svn/e/trunk/e"
 _svnmod="e"
@@ -41,7 +40,7 @@ msg "Connecting to $_svntrunk SVN server...."
   cd $_svnmod-build
   
   # set default suspend/hibernate commands in config file
-  patch -Np0 -i ${srcdir}/sysactions.patch
+#  patch -Np0 -i ${srcdir}/sysactions.patch
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --enable-pam
   make
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 815991955..6fb83d2d5 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41229 2011-03-04 22:17:26Z rvanharen $
+# $Id: PKGBUILD 46193 2011-05-04 10:10:41Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e_dbus-svn
-pkgver=57317
+pkgver=58954
 pkgrel=1
 pkgdesc="dbus abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index b12d04115..8d162a975 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41205 2011-03-04 22:13:31Z rvanharen $
+# $Id: PKGBUILD 46172 2011-05-04 10:03:34Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ecore-svn
-pkgver=57503
+pkgver=58945
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index fda8833f9..6175a7549 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41219 2011-03-04 22:15:51Z rvanharen $
+# $Id: PKGBUILD 46185 2011-05-04 10:07:59Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=edje-svn
-pkgver=57412
+pkgver=58887
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index bb7939882..97b4c7e20 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40537 2011-02-25 09:37:13Z rvanharen $
+# $Id: PKGBUILD 46164 2011-05-04 10:00:51Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet-svn
-pkgver=57246
+pkgver=58955
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index ffa0f64f1..410375fee 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: bluebugs
 
 pkgname=eeze-svn
-pkgver=57501
+pkgver=58668
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index 014602053..a766a7290 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41224 2011-03-04 22:16:41Z rvanharen $
+# $Id: PKGBUILD 46188 2011-05-04 10:08:58Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=efreet-svn
-pkgver=57435
+pkgver=58672
 pkgrel=1
 pkgdesc="freedesktop.org specifications for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index da58f841f..27f2a643b 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41191 2011-03-04 22:11:05Z rvanharen $
+# $Id: PKGBUILD 46161 2011-05-04 09:59:52Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina-svn
-pkgver=57387
+pkgver=58920
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 6b915cb37..856f5f2e3 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=elementary-svn
-pkgver=57515
+pkgver=58962
 pkgrel=1
 pkgdesc="Enlightenment's basic widget set"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index cfa493f7a..bd438de37 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40593 2011-02-25 15:01:57Z rvanharen $
+# $Id: PKGBUILD 46180 2011-05-04 10:06:17Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=embryo-svn
-pkgver=57246
+pkgver=58829
 pkgrel=1
 pkgdesc="implementation of a C like scripting language for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 09b483161..c097ecb9d 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41200 2011-03-04 22:12:36Z rvanharen $
+# $Id: PKGBUILD 46169 2011-05-04 10:02:34Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
-pkgver=57457
+pkgver=58958
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index b079ca98c..8ea418b77 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Christian Himpel <chressie at gmail dot com>
 
 pkgname=go
-pkgver=r56
+pkgver=r57.1
 pkgrel=1
 epoch=1
 pkgdesc='Google Go compiler and tools (release version)'
@@ -75,10 +75,4 @@ package() {
   install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
-
-  # Point Python scripts to the python2 binary
-  cd $pkgdir/usr/share/go/misc/dashboard
-  sed -i 's/python$/\02/' {buildcontrol,googlecode_upload}.py godashboard/app.yaml
-  sed -i 's/python"/python2"/' builder/main.go
-  sed -i 's/python /python2 /' builder.sh
 }
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 1067f8a31..d95b2c18c 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 41263 2011-03-04 22:40:08Z remy $
+# $Id: PKGBUILD 46145 2011-05-04 08:33:47Z 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=3.1
+pkgrel=4
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
@@ -19,7 +19,8 @@ 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-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
+	--enable-library-profiling
     runhaskell Setup build
     runhaskell Setup haddock
     runhaskell Setup register   --gen-script
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index 2aeb1505e..e9dec093d 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 32688 2010-11-16 16:50:22Z lcarlier $
+# $Id: PKGBUILD 46270 2011-05-04 12:13:34Z rvanharen $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Thomas Haider <t.haider@vcnc.org>
 
 pkgname=libev
-pkgver=4.01
+pkgver=4.04
 pkgrel=1
 pkgdesc="A full-featured and high-performance event loop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/libev.html"
 license=('BSD')
 depends=('glibc')
-options=('!libtool' 'force')
+options=('!libtool')
 source=(http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2a6e0d3d7eda7d54b39f3800b8279707')
+sha1sums=('7768c2bcce30dbf76672e51642a655479dd45772')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 3707ff40a..60bf50bc8 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44159 2011-04-04 10:37:36Z bluewind $
+# $Id: PKGBUILD 46148 2011-05-04 08:34:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,8 +7,8 @@
 
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.0
-pkgrel=3
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
@@ -16,7 +16,7 @@ license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('06dd5bd6f00ae8fec64d45f0b74cac88')
+md5sums=('3adeace6642a5ee0db0715b6bd7b7a52')
 
 build() {
   # mlt
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index c155037dd..640f8c2ef 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 40148 2011-02-20 17:41:47Z svenstaro $
+# $Id: PKGBUILD 46129 2011-05-04 05:39:59Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -9,7 +9,7 @@
 
 pkgname=mumble
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('GPL')
@@ -30,7 +30,7 @@ build() {
   # Building mumble
   /usr/bin/qmake main.pro \
     CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \
-    no-embed-qt-translations packaged" \
+    no-embed-qt-translations no-update packaged" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
   make release
 }
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 856db7eec..5934210e6 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 42510 2011-03-17 12:19:39Z andrea $
+# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
 
 pkgname=mysql-workbench
-pkgver=5.2.33
-pkgrel=2
+epoch=1
+pkgver=5.2.33b
+pkgrel=1
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://dev.mysql.com/workbench/"
+url="http://wb.mysql.com/"
 license=('GPL2')
-depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect')
+depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl'
+         'libsigc++' 'python-paramiko' 'python-pexpect')
 makedepends=('boost' 'curl' 'mesa')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
-        ArchLinux.xml arch.patch python27.patch)
-md5sums=('d97a1512c8c8ad54ae83441f8ea5c4b8'
+        ArchLinux.xml arch.patch python27.patch gcc46.patch)
+md5sums=('850e081eeaea87a88c408483817e4b1f'
          'c2f986cd5737413d020c55db32713c48'
          '23430d24400fd65c9fd872bd8e2411e5'
-         '47bc4cdfaa035a0132392e94c462ebf7')
+         '47bc4cdfaa035a0132392e94c462ebf7'
+         '8e7a6d5aa59b73727e862724f115d90a')
 
 build() {
-  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
+  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
 
   cp "${srcdir}/ArchLinux.xml" res/mysql.profiles
   patch -Np1 -i ${srcdir}/arch.patch
 
   patch -Np0 -i ${srcdir}/python27.patch
+  patch -p1 -i ${srcdir}/gcc46.patch
 
   #we use System provided libraries
   rm -rf ext/curl
@@ -35,14 +39,14 @@ build() {
   rm -rf ext/libsigc++
 
   export CPPFLAGS=$(pkg-config --cflags sigc++-2.0)
-  unset LDFLAGS
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
 
   ./autogen.sh --prefix=/usr --disable-debug --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
+  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
 
   make DESTDIR="${pkgdir}" install
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py
diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch
new file mode 100644
index 000000000..9daa162c8
--- /dev/null
+++ b/community/mysql-workbench/gcc46.patch
@@ -0,0 +1,113 @@
+diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp
+--- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46	2011-03-23 17:05:33.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp	2011-03-23 17:06:02.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "grts/structs.workbench.model.reporting.h"
+ #include "grts/structs.workbench.physical.h"
+ 
+-
++namespace wb {
+ void register_all_metaclasses()
+ {
+   register_structs_app_xml();
+@@ -46,3 +46,6 @@ void register_all_metaclasses()
+   register_structs_workbench_model_reporting_xml();
+   register_structs_workbench_physical_xml();  
+ }
++// end of namespace wb
++}
++
+diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
+--- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46	2011-03-23 16:56:16.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp	2011-03-23 17:07:36.000000000 +0100
+@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
+   }
+ 
+   Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns);
+-  Gtk::ComboBox *combo= new Gtk::ComboBox(model);
++  Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model);
+ 
+   combo->pack_start(color_combo_columns->image);
+ 
+diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46	2011-03-23 17:04:17.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp	2011-03-23 17:04:40.000000000 +0100
+@@ -32,10 +32,11 @@
+ #include <math.h>
+ #include "base/log.h"
+ ENABLE_LOG("mforms.utils")
+-
+ using namespace mforms;
+ 
++namespace mforms {
+ GThread *_mforms_main_thread=0;
++}
+ 
+ static std::map<std::string, int> remembered_message_answers;
+ static std::string remembered_message_answer_file;
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46	2011-03-17 13:48:45.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp	2011-03-23 16:44:22.000000000 +0100
+@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP 
+ 
+ //============================================================================
+ 
++namespace grt {
++
+ static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd)
+ {
+   MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group;
+@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g
+   }
+ }
+ 
++// End of namspace grt
++}
++
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46	2011-03-17 13:48:41.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp	2011-03-23 16:44:22.000000000 +0100
+@@ -187,7 +187,7 @@ NL
+ };
+ 
+ 
+-void grt_shell_show_python_help(grt::GRT *grt, const char *command)
++void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command)
+ {
+   if (!command || !*command)
+     grt->send_output(
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46	2011-03-17 13:48:39.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h	2011-03-23 16:44:22.000000000 +0100
+@@ -21,6 +21,8 @@
+ #ifndef __grtpp_shell_python_help_h__
+ #define __grtpp_shell_python_help_h__
+ 
++namespace grt {
+ void grt_shell_show_python_help(grt::GRT *grt, const char *command);
++}
+ 
+-#endif /* __grtpp_shell_python_help_h__ */
+\ Pas de fin de ligne à la fin du fichier.
++#endif /* __grtpp_shell_python_help_h__ */
+diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h
+--- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46	2011-03-23 16:51:30.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h	2011-03-23 16:52:33.000000000 +0100
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <cstddef>
+ #include "ctemplate/template.h"
+ 
+ #include "grt/common.h"
+--- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~	2011-05-04 00:57:31.029029610 -0700
++++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in	2011-05-04 00:57:45.162361700 -0700
+@@ -54,6 +54,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <cstddef>
+ #include <ctemplate/template_dictionary_interface.h>
+ #include <ctemplate/template_string.h>
+ #include <ctemplate/template_modifiers.h>
diff --git a/community/openlierox/PKGBUILD b/community/openlierox/PKGBUILD
index 752726072..3580262d1 100644
--- a/community/openlierox/PKGBUILD
+++ b/community/openlierox/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 29214 2010-10-11 15:58:28Z svenstaro $
+# $Id: PKGBUILD 46134 2011-05-04 07:37:58Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=openlierox
 pkgver=0.58_rc3
-pkgrel=2
+pkgrel=3
 pkgdesc="A real-time excessive Worms-clone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openlierox.net/"
diff --git a/community/paintown/PKGBUILD b/community/paintown/PKGBUILD
deleted file mode 100644
index 6b4def06f..000000000
--- a/community/paintown/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jschares <jacob.schares@gmail.com>
-# Contributor: celmir <scibecelmir@tuxfamily.org>
-# Contributor: Feufochmar <guill.delacourt@gmail.com>
-pkgname=paintown
-pkgver=3.4.0
-pkgrel=2
-pkgdesc="An open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://paintown.sourceforge.net/"
-license=('GPL')
-depends=('python2' 'freetype2' 'allegro')
-makedepends=('cmake')
-#install=paintown.install
-source=(http://downloads.sourceforge.net/sourceforge/paintown/$pkgname-$pkgver.tar.gz
-        paintown.png
-        paintown.desktop)
-md5sums=('f1d49ffc3149b545d95a57f99570331f'
-         'ed547f1377212ea079cf9b0a1ad2d587'
-         '4144c695ad0bc4621e96ef9760f33b19')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-# fix python2 header
-  for file in $(find . -name '*.py' -print); do
-     sed -i "s#/usr/bin/python#/usr/bin/env python2#" $file
-  done
-# not needed as cmake is used instead of scons
-#  sed -i "s#python#python2#" Makefile
-  mkdir -p build
-  cd build
-  cmake ..
-  make
-  cp bin/paintown ..
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p $pkgdir/usr/{bin,share/{paintown,pixmaps,applications,licenses/paintown}}
-  sh install.sh -d $pkgdir/usr/share/paintown -b $pkgdir/usr/bin
-# correct the gnerated file to remove the wrong path (because $pkgdir/usr/bin is written in the file)
-  sed -i "s#$pkgdir##g" $pkgdir/usr/bin/paintown
-  install -m644 $srcdir/paintown.desktop $pkgdir/usr/share/applications/paintown.desktop
-  install -m644 $srcdir/paintown.png $pkgdir/usr/share/pixmaps/paintown.png
-  install -m644 LICENSE $pkgdir/usr/share/licenses/paintown/LICENSE
-  install -m644 LEGAL $pkgdir/usr/share/licenses/paintown/LEGAL
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/paintown/paintown.desktop b/community/paintown/paintown.desktop
deleted file mode 100644
index e729ecbd0..000000000
--- a/community/paintown/paintown.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=PainTown
-Comment=Paintown is an open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles.
-Exec=paintown
-Icon=paintown.png
-Terminal=false
-Type=Application
-Categories=Application;Game;
diff --git a/community/paintown/paintown.png b/community/paintown/paintown.png
deleted file mode 100644
index c7e4830e4..000000000
--- a/community/paintown/paintown.png
+++ /dev/null
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index 23a01c587..1af23f7c3 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 35604 2010-12-21 22:55:11Z tdziedzic $
+# $Id: PKGBUILD 46151 2011-05-04 08:34:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=0.66
-pkgrel=2
+pkgver=0.69
+pkgrel=1
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime"
@@ -12,18 +12,25 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' 'perl-params-validate>=0.76')
 LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
-options=('!emptydirs' 'force')
+options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('9399b5b430da65ac0b9056c0182a805b')
+md5sums=('d14c4439bd0b81446e54504db68fd64f')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
-
   perl Build.PL installdirs=vendor destdir="$pkgdir/"
   ./Build
+}
+
+check() {
+  cd  $srcdir/DateTime-$pkgver
 #  ./Build test
-  ./Build install
+  true
+}
 
+package() {
+  cd  $srcdir/DateTime-$pkgver
+  ./Build install
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
 }
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 7d4b5f78f..8de4ff739 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 41903 2011-03-10 21:36:50Z ebelanger $
+# $Id: PKGBUILD 46293 2011-05-04 15:27:19Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Vladimir Chizhov <jagoterr@gmail.com>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=recoll
-pkgver=1.15.7
+pkgver=1.15.8
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,8 +25,7 @@ optdepends=('unzip: for the OpenOffice.org documents'
             'python2: for using some filters')
 install=recoll.install
 source=(http://www.lesbonscomptes.com/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('649ebef60a1920dc2a195211993b3489')
-sha1sums=('2494d71e4218df5a7e6a9715ef8dcee82e977ff8')
+md5sums=('ca08ff6b8898587c120effd98cc9c85a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,9 +34,9 @@ build() {
   for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py} doc/user/usermanual.html; do
       sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
   done
-  sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py 
+  sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py
 
-   ./configure \
+  ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man
 
@@ -45,6 +45,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index 8b68e6af8..4bf658df1 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 3564 2009-10-06 07:22:09Z spupykin $
+# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=scponly
 pkgver=4.8
-pkgrel=6
+pkgrel=7
 pkgdesc="A limited shell for ssh/scp"
 arch=(i686 x86_64 'mips64el')
 url="http://www.sublimation.org/scponly/"
@@ -14,22 +14,22 @@ options=(docs)
 source=(http://downloads.sourceforge.net/sourceforge/scponly/scponly-$pkgver.tgz
 	setup_chroot.sh)
 md5sums=('139ac9abd7f3b8dbc5c5520745318f8a'
-         '3318e648c106b1e7ed7826296c296d1a')
+         'a5e26c355cf4f127a1f2fdf2fb1582cc')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc \
 	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary
-
   sed -i 's|^#elif|#else|' helper.c
+  make
+}
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-
-  install -D -m0644 COPYING $startdir/pkg/usr/share/licenses/scponly/COPYING && \
-  mv $pkgdir/usr/man $pkgdir/usr/share/ || return 1
-
-  mkdir -p $pkgdir/usr/share/doc/scponly && \
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m0644 COPYING $pkgdir/usr/share/licenses/scponly/COPYING
+  mv $pkgdir/usr/man $pkgdir/usr/share/
+  mkdir -p $pkgdir/usr/share/doc/scponly
   cp $srcdir/setup_chroot.sh config.h $pkgdir/usr/share/doc/scponly/
 }
diff --git a/community/scponly/setup_chroot.sh b/community/scponly/setup_chroot.sh
index cd1a260eb..1af9807e0 100755
--- a/community/scponly/setup_chroot.sh
+++ b/community/scponly/setup_chroot.sh
@@ -79,7 +79,7 @@ fi
 #
 #	we also need to add some form of ld.so, here are some good guesses.
 #
-LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1"
+LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1"
 for lib in $LDSO_LIST; do
 	if [ -f $lib ]; then
 		LDSOFOUND=1;
@@ -95,6 +95,11 @@ if [ $? -eq 0 ]; then
 	LIB_LIST="$LIB_LIST /lib/libnss_compat*"
 fi
 
+ls /lib/libnss_files* > /dev/null 2>&1 
+if [ $? -eq 0 ]; then
+	LIB_LIST="$LIB_LIST /lib/libnss_files*"
+fi
+
 # check that the configure options are correct for chrooted operation:
 
 if [ x/usr/sbin/useradd = x ]; then
diff --git a/community/ufoai/PKGBUILD b/community/ufoai/PKGBUILD
deleted file mode 100644
index 55bfb5374..000000000
--- a/community/ufoai/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 34218 2010-12-04 20:28:44Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=ufoai
-pkgver=2.3.1
-pkgrel=1
-pkgdesc="In UFO: Alien Invasion you fight aliens trying to capture Earth"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ufoai.ninex.info/"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'curl' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'xvidcore' 'ufoai-data')
-makedepends=('mesa')
-source=(http://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$pkgver/ufoai-$pkgver-source.tar.bz2)
-md5sums=('87b3e1bf3439dc6e5413936034f47d17')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver-source
-
-  #./configure --prefix=/usr --enable-release --disable-uforadiant
-  # remove --enable-release because it causes crashes on some systems
-  mkdir base
-  ./configure --prefix=/usr --disable-uforadiant --enable-release
-  make
-  make lang
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver-source
-
-  make DESTDIR="$pkgdir" install_exec
-
-  install -D -m644 debian/ufoai.desktop "$pkgdir"/usr/share/applications/ufoai.desktop
-  install -D -m644 debian/ufoai-safe.desktop "$pkgdir"/usr/share/applications/ufoai-safe.desktop
-  install -D -m644 debian/ufoded.desktop "$pkgdir"/usr/share/applications/ufoded.desktop
-
-  sed -i 's|/usr/games/||' "$pkgdir"/usr/share/applications/*
-
-  install -D -m644 debian/ufoai.xpm "$pkgdir"/usr/share/pixmaps/ufoai.xpm
-  install -D -m644 debian/ufoded.xpm "$pkgdir"/usr/share/pixmaps/ufoded.xpm
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
new file mode 100644
index 000000000..15d70051a
--- /dev/null
+++ b/core/cronie/PKGBUILD
@@ -0,0 +1,67 @@
+# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname='cronie'
+pkgver=1.4.7
+pkgrel=7
+pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
+url='https://fedorahosted.org/cronie/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+depends=('pam' 'bash' 'run-parts')
+
+source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'cron.deny'
+        'crontab'
+        'pam.d'
+        'rc.d')
+sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f'
+          '0f279b8fb820340267d578dc85511c980715f91e'
+          '4059bc4ccb75f08b0d4970940799e5d9722b339f'
+          '6d8aef6880935b3dcc3e28481111d036544eeae5'
+          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
+
+backup=('etc/crontab'
+        'etc/anacrontab'
+        'etc/conf.d/crond'
+        'etc/pam.d/crond'
+        'etc/cron.deny')
+
+conflicts=('cron')
+provides=('cron')
+groups=('base')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-anacron \
+		--with-inotify \
+		--with-pam \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
+	install -d "${pkgdir}"/var/spool/{ana,}cron
+	chmod u+s "${pkgdir}"/usr/bin/crontab
+
+	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
+	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
+	install -Dm644 ../crontab "${pkgdir}"/etc/crontab
+	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
+	install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
+	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
+	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
+	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
+
+	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
+}
diff --git a/core/cronie/cron.deny b/core/cronie/cron.deny
new file mode 100644
index 000000000..06e685cc8
--- /dev/null
+++ b/core/cronie/cron.deny
@@ -0,0 +1 @@
+# without this file, only users listed in /etc/cron.allow can use crontab
diff --git a/core/cronie/crontab b/core/cronie/crontab
new file mode 100644
index 000000000..f2ce71030
--- /dev/null
+++ b/core/cronie/crontab
@@ -0,0 +1 @@
+# without this file, crond disables inotify support at startup
diff --git a/core/cronie/pam.d b/core/cronie/pam.d
new file mode 100644
index 000000000..094051b5e
--- /dev/null
+++ b/core/cronie/pam.d
@@ -0,0 +1,7 @@
+account   required    pam_access.so
+account   required    pam_time.so
+account   required    pam_unix.so
+
+session   required    pam_limits.so
+session   required    pam_env.so
+session   required    pam_unix.so
diff --git a/core/cronie/rc.d b/core/cronie/rc.d
new file mode 100755
index 000000000..d0659685c
--- /dev/null
+++ b/core/cronie/rc.d
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=crond
+. /etc/conf.d/crond
+PID=$(pidof -o %PPID /usr/sbin/crond)
+
+case "$1" in
+start)
+	stat_busy "Starting $name daemon"
+	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
+	&& { add_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+stop)
+	stat_busy "Stopping $name daemon"
+	[[ -n "$PID" ]] && kill $PID &>/dev/null \
+	&& { rm_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+reload)
+	stat_busy "Reloading $name daemon"
+	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+	&& { stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+*)
+	echo "usage: $0 {start|stop|restart|reload}"
+	;;
+esac
+exit 0
diff --git a/core/dcron/PKGBUILD b/core/dcron/PKGBUILD
deleted file mode 100644
index 77003d83d..000000000
--- a/core/dcron/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Paul Mattal <paul.archlinux.org>
-
-pkgname=dcron
-pkgver=4.4
-pkgrel=2
-pkgdesc="dillon's lightweight cron daemon"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron"
-backup=(var/spool/cron/root etc/conf.d/crond)
-depends=('glibc')
-provides=('cron')
-groups=('base')
-source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz"
-	'dcron-logname.patch'
-	'dcron.rc.d'
-	'dcron.conf.d')
-md5sums=('02d848ba043a9df5bf2102a9f4bc04bd'
-	 'c6054421b48100f7a2a7a36e2d33c92a'
-	 '73693cdd59df526e729cdec99c5ed8fb'
-	 '5bfa07beb54d0beaf3f38225e4d5a9fa')
-optdepends=('smtp-server: sending cron job output via email')
-install=$pkgname.install
-
-build() {
-	cd "$srcdir/${pkgname}-${pkgver}" || return 1
-
-	# patch to add LOGNAME environment variable
-	patch -p1 -i $srcdir/dcron-logname.patch || return 1
-
-	# by default, any member of group "users" can edit their own crontab
-	make \
-		PREFIX=/usr \
-		CRONTAB_GROUP=users \
-		CRONTABS=/var/spool/cron \
-		CRONSTAMPS=/var/spool/cronstamps \
-		|| return 1
-	make DESTDIR="$pkgdir" install || return 1
-
-	# install standard configuration and scripts
-	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} \
-		|| return 1
-	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" || return 1
-	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" \
-		|| return 1
-
-	# install Arch configuration and launch scripts
-	install -D -m755 "$srcdir/dcron.rc.d" "$pkgdir/etc/rc.d/crond" || return 1
-	install -D -m0644 "$srcdir/dcron.conf.d" "$pkgdir/etc/conf.d/crond" || return 1
-}
diff --git a/core/dcron/dcron-logname.patch b/core/dcron/dcron-logname.patch
deleted file mode 100644
index c37c5f45f..000000000
--- a/core/dcron/dcron-logname.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur dcron-4.4/chuser.c dcron-4.4.logname/chuser.c
---- dcron-4.4/chuser.c	2010-02-15 11:18:13.111967483 +0100
-+++ dcron-4.4.logname/chuser.c	2010-02-15 11:18:29.615531204 +0100
-@@ -25,6 +25,7 @@
- 		return(-1);
- 	}
- 	setenv("USER", pas->pw_name, 1);
-+	setenv("LOGNAME", pas->pw_name, 1);
- 	setenv("HOME", pas->pw_dir, 1);
- 	setenv("SHELL", "/bin/sh", 1);
- 
-diff -aur dcron-4.4/crontab.1 dcron-4.4.logname/crontab.1
---- dcron-4.4/crontab.1	2010-02-15 11:18:13.111967483 +0100
-+++ dcron-4.4.logname/crontab.1	2010-02-15 11:19:48.295707950 +0100
-@@ -57,8 +57,8 @@
- .PP
- Nor does it do any special environment handling.
- A shell script is better-suited to doing that than a cron daemon.
--This cron daemon sets up only three environment variables: USER,
--HOME, and SHELL.
-+This cron daemon sets up only four environment variables: USER,
-+LOGNAME, HOME, and SHELL.
- .PP
- Our crontab format is roughly similar to that used by vixiecron.
- Individual fields may contain a time, a time range, a time range
diff --git a/core/dcron/dcron.conf.d b/core/dcron/dcron.conf.d
deleted file mode 100644
index 763c71263..000000000
--- a/core/dcron/dcron.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to crond
-#
-CROND_ARGS="-S -l info"
diff --git a/core/dcron/dcron.install b/core/dcron/dcron.install
deleted file mode 100644
index ba08b3af1..000000000
--- a/core/dcron/dcron.install
+++ /dev/null
@@ -1,10 +0,0 @@
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if [ "`vercmp $2 4.0`" -lt 0 ]
-  then
-    echo "Restart crond, since you're upgrading to the dcron 4.x series."
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/core/dcron/dcron.rc.d b/core/dcron/dcron.rc.d
deleted file mode 100644
index b1a5770e6..000000000
--- a/core/dcron/dcron.rc.d
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/crond
-
-PID=$(pidof -o %PPID /usr/sbin/crond)
-case $1 in
-start)
-	stat_busy "Starting Cron Daemon"
-
-	# defaults to using syslog, and sendmail-ing cron output to local user
-	# to mail output to remote address instead, add "-m user@host"
-	# to CROND_ARGS in /etc/conf.d/crond
-	if [[ -z $PID ]] && /usr/sbin/crond $CROND_ARGS; then
-
-		PID=$(pidof -o %PPID /usr/sbin/crond)
-		echo "$PID" > /var/run/crond.pid
-		add_daemon crond
-		stat_done
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-stop)
-	stat_busy "Stopping Cron Daemon"
-	if [[ ! -z $PID ]]  && kill "$PID" &>/dev/null; then
-		rm_daemon crond
-		stat_done
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-restart)
-	$0 stop
-	$0 start
-	;;
-
-*)
-	echo "Usage: $0 {start|stop|restart}" >&2
-	exit 1
-
-esac
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 077c40cd5..75f0f8f89 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120135 2011-04-20 11:43:51Z ibiru $
+# $Id: PKGBUILD 122457 2011-05-04 07:52:42Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> 
 pkgname=nilfs-utils
-pkgver=2.0.22
+pkgver=2.0.23
 pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux-ng')
 options=(!libtool)
 source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d7650e53fbd4a73ef56e07a354fdd2b0')
+md5sums=('7f7e835d02e14642e8b7b32a36b7fab0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 43e69d149..af2520525 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 108830 2011-02-04 07:33:09Z bisson $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=5.8p1
+pkgver=5.8p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +16,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '660092c57bde28bed82078f74011f95fc51c2293'
           '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 90710ebb6..0ee60d462 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107583 2011-01-26 21:07:38Z tpowa $
+# $Id: PKGBUILD 115045 2011-03-16 15:19:12Z jgc $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -17,15 +17,14 @@ md5sums=('35222edb86b50a6641352c66fe829b2e')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./update-pciids.sh
-  make OPT="$CFLAGS -fPIC -DPIC" ZLIB=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=${pkgdir}/usr SHAREDIR=${pkgdir}/usr/share/hwdata MANDIR=${pkgdir}/usr/share/man install
-  install -d ${pkgdir}/usr/lib
-  install -m644 lib/libpci.a ${pkgdir}/usr/lib
-  for i in config.h header.h pci.h types.h; do
-    install -D -m 644 lib/${i} ${pkgdir}/usr/include/pci/${i}
-  done
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
 }
diff --git a/core/rp-pppoe/PKGBUILD b/core/rp-pppoe/PKGBUILD
index c47683f19..7e2e268ca 100644
--- a/core/rp-pppoe/PKGBUILD
+++ b/core/rp-pppoe/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 77813 2010-04-18 07:47:31Z allan $
+# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Maintainer:
 
 pkgname=rp-pppoe
 pkgver=3.10
-pkgrel=5
+pkgrel=6
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
-groups=('base')
 depends=('ppp>=2.4.5' 'sh')
 options=('!makeflags')
 backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
@@ -20,8 +19,8 @@ md5sums=('d58a13cc4185bca6121a606ff456dec0'
 
 build() {
   cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin=/ppp-2.4.4
-  make || return 1
+  ./configure --prefix=/usr --enable-plugin
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
 }
 
 package() {
diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD
index 3085643ae..c57b7cdac 100644
--- a/core/run-parts/PKGBUILD
+++ b/core/run-parts/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100361 2010-11-23 00:00:38Z pierre $
+# $Id: PKGBUILD 120288 2011-04-22 06:59:00Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=run-parts
-pkgver=3.4.1
+pkgver=3.4.4
 pkgrel=1
 pkgdesc='run scripts or programs in a directory'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://packages.qa.debian.org/d/debianutils.html'
 license=('GPL')
 depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-md5sums=('d488563ad7ea356d83f848becb1a3a4a')
+source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz")
+sha256sums=('f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe')
 
 build() {
 	cd $srcdir/debianutils-$pkgver
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 45059d023..06cc39661 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118993 2011-04-09 21:57:35Z allan $
+# $Id: PKGBUILD 120368 2011-04-22 22:01:28Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.1
+_ver=1.8.1p1
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,7 +15,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz
         sudo.pam)
 options=('!libtool' '!makeflags')
-md5sums=('e4402f24cccc3c6697b1eeab496053dd'
+md5sums=('318337804d976c9419cf3004b707945c'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 466292f14..31c83a9e9 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 116702 2011-03-25 08:26:34Z tpowa $
+# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
 pkgname=usbutils
 pkgver=002
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Device Utilities"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 groups=('base')
 makedepends=('wget')
 depends=('glibc' 'libusb')
+optdepends=('python2: for lsusb.py usage'
+           'coreutils: for lsusb.py usage')
 url="http://linux-usb.sourceforge.net/"
-source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('05610d15c3c8c8ada3d691c320ca784a')
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+        fix-python2.patch)
+md5sums=('05610d15c3c8c8ada3d691c320ca784a'
+         '45766196895b4cc50b53cd56e1bbf3d1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   rm usb.ids
   wget http://www.linux-usb.org/usb.ids
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i ../fix-python2.patch
   ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
   make
 }
diff --git a/testing/usbutils/fix-python2.patch b/core/usbutils/fix-python2.patch
index 7e2875e99..7e2875e99 100644
--- a/testing/usbutils/fix-python2.patch
+++ b/core/usbutils/fix-python2.patch
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 660bc6894..430a3002e 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,143 +1,89 @@
-# $Id: PKGBUILD 101917 2010-12-02 16:14:10Z ibiru $
+# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
-# TODO:
-# - consider switching to scons when it is better supported
-
 # Apparently, the blender guys refuse to release source tarballs for
 # intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from cvs. 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 cvs
-# tags if necessary.
-#cvs=true
-cvs=false
+# 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.49b
+pkgver=2.57b
 pkgrel=2
+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' 'openexr' 'sdl' 'python2' 'desktop-file-utils' \
-         'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal')
-makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm' 'csv')
-options=('!makeflags')
+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')
+makedepends=('cmake') # 'subversion'
 install=blender.install
-source=($pkgname.desktop $pkgname.svg)
-if [ ! $cvs -o $cvs = false ]; then
-  makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm')
-  source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8'
-         '0e53299444ff5570639c8f59372bc98c'
-         '718eef6a4ff377989e829b92a886cc5b')
-  sha1sums=('9ae82b5df21b4803f981e3df4a256b4be7137273'
-          '1e5452f56f590d5ce1af8c174113f0e639714c0c'
-          '43f71e7de4efe79c518d45f4b5a04e03c28d5fc5')
+if [ $_svn = false ]; then
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('e6cb5523323a71c070051e6fe6efe497')
+else
+  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
+  md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
 fi
 
-build() {
-  if [ $cvs = true ]; then
-    cd "$srcdir/"
-    #cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login
-    cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender checkout $pkgname
-    _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release
-    cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel
-    find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null
-    cd $pkgname
-  else
-    cd "$srcdir/$pkgname-$pkgver"
-  fi
-
- rm -f user-def.mk
-
- ##########################################################################
- # tweak the makefiles to prepare build for ArchLinux
-   # disable static binaries and enable blenderplayer binary
-  sed -i "s|^.*\(BINTARGETS += blenderstatic\)|    #\1|g" source/Makefile
-  sed -i "s|^#\(.*BINTARGETS += blenderplayer\)|\1|g" source/Makefile
-  # link freetype and openal dynamically
-  sed -i 's|LOPTS)|LOPTS) -lfreetype -lopenal|g' source/Makefile
-  sed -i 's|COMLIB.*libfreetype\.a|#\0|g' source/Makefile
-  sed -i 's|NAN_SND_LIBS.*libopenal\.a|#\0|g' source/Makefile
-   # make ode (alternative physics engine)
-   # does not work for Arch64
-   #[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile
-   # make the nan_makefiles happy
-  export NAN_PYTHON_VERSION=2.7
-  export INTERNATIONAL=true
-  export WITH_FREETYPE2=true
-  export NAN_FREETYPE=/usr
-  export WITH_ICONV=true
-
-  export NAN_NO_PLUGIN=true
-
-  export NAN_OPENAL=/usr
-  export NAN_FMOD=/usr
-  export NAN_JPEG=/usr
-  export NAN_PNG=/usr
-  export WITH_OPENEXR=true
-  export NAN_OPENEXR=/usr
-  export NAN_ODE=/usr
-  export NAN_OPENEXR_LIBS=$(pkg-config --libs-only-l OpenEXR)
-
-  export NAN_SDL=/usr
-  export NAN_ZLIB=/usr
-  export NAN_MESA=/usr
+# 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
+}
 
-  export NAN_USE_BULLET=true
-  export NAN_USE_FFMPEG_CONFIG=true
-  export WITH_BF_VERSE=true
-  export WITH_VERSE=true
-  export WITH_BF_OPENMP=true
-  # there is an issue with a file
-  export NAN_DEBUG=-O
- ###########################################################################
- # build
-  LDFLAGS="-Wl,--hash-style=gnu"
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir build
+  cd build
+
+  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_PYTHON_INSTALL:BOOL=OFF \
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -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() {
-  if [ $cvs = true ]; then
-    cd "$srcdir/$pkgname"
-  else
-    cd "$srcdir/$pkgname-$pkgver"
-  fi
-
-  cd obj/linux-glibc2*/bin
-
-# common part
-
- mkdir -p "$pkgdir/usr/share/"
-
- # install binaries
- install -Dm755 blender "$pkgdir/usr/bin/blender"
- install -Dm755 blenderplayer "$pkgdir/usr/bin/blenderplayer"
-
- # install internationalization support
- cd ../../../bin/.blender
- install -D -m644 .Blanguages \
-   "$pkgdir/usr/share/$pkgname/.Blanguages"
- install -D -m644 .bfont.ttf \
-   "$pkgdir/usr/share/$pkgname/.bfont.ttf"
-
- cp -R locale "$pkgdir/usr/share/"
-
- # install scripts
- cd ../../release/
- cp -R scripts "$pkgdir/usr/share/$pkgname/"
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "$pkgdir/usr/share/blender/scripts/bpymodules/blend2renderinfo.py"
-
- # install all additional stuff
- # install a freedesktop.org compliant menu entry
- install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
- # install some freedesktop.org compatibility
- install -D -m644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
- # finally we render a png as fallback for not svg aware menu applications
- # Attention: always make sure you check the dimensions of the source-svg,
- # you can read the dimensions via inkscape's export function
- rsvg -w 64 -h 64 -f png "$pkgdir/usr/share/pixmaps/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  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/extra/blender/blender.desktop b/extra/blender/blender.desktop
deleted file mode 100644
index 71893dc4a..000000000
--- a/extra/blender/blender.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender
-Name[da]=Blender
-Name[nl]=Blender
-Name[no]=Blender
-Name[de]=Blender
-Name[es]=Blender
-Comment=A 3D program
-Comment[es]=Un programa de 3D
-Comment[no]=Et 3d-program
-Comment[da]=Et program til 3d-modelering
-Exec=blender
-Icon=blender
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Graphics;3DGraphics;
-MimeType=application/blender;application/x-blender;
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
index 0cc7aef46..2fcf98022 100644
--- a/extra/blender/blender.install
+++ b/extra/blender/blender.install
@@ -3,26 +3,25 @@ post_install() {
 
 NOTE
 ----
-blender is using the NAN makefiles to build, so we can access some better
-features:
-	- i18n support
-	- anti-aliased interface fonts
-	- gameplayer
+
 We also ship the plugins, but most of these features can be accessed only
-from the users home directory. Therefore, you wanna copy everything from
-/usr/share/blender to ~/.blender (some are hidden files!). The browser-
-plugin builds but is using an old mozilla API, this is why it doesn't work
-and we don't ship it.
-Happy blending!
+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
 }
 
 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/extra/blender/blender.svg b/extra/blender/blender.svg
deleted file mode 100644
index ab61cc362..000000000
--- a/extra/blender/blender.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   id="svg1573"
-   sodipodi:version="0.32"
-   inkscape:version="0.39"
-   width="100.00000pt"
-   height="100.00000pt"
-   sodipodi:docbase="/home/build/abs/extra/multimedia/blender"
-   sodipodi:docname="blender.svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs
-     id="defs1575">
-    <linearGradient
-       id="linearGradient1792">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.42937854;"
-         offset="0.0000000"
-         id="stop1793" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.12429378;"
-         offset="0.63222224"
-         id="stop1795" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1794" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient1792"
-       id="radialGradient1950"
-       cx="0.50000000"
-       cy="0.50000000"
-       r="0.50000000"
-       fx="0.67944252"
-       fy="0.19298245" />
-    <linearGradient
-       id="linearGradient1606">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.62745100;"
-         offset="0.0000000"
-         id="stop1607" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1608" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999998"
-     inkscape:cx="50.134523"
-     inkscape:cy="35.997949"
-     inkscape:window-width="1272"
-     inkscape:window-height="1002"
-     showgrid="true"
-     snaptogrid="false"
-     gridspacingy="10.000000pt"
-     gridspacingx="10.000000pt"
-     gridoriginy="0.0000000pt"
-     gridoriginx="0.0000000pt"
-     gridtolerance="2.0000000px"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     inkscape:window-x="1282"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF
-       id="RDF1577">
-      <cc:Work
-         rdf:about=""
-         id="Work1578">
-        <dc:description
-           id="description1579">Created with Inkscape
-http://www.inkscape.org/</dc:description>
-        <dc:format
-           id="format1581">image/svg+xml</dc:format>
-        <dc:type
-           id="type1583"
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title
-           id="title1606">ML-Term Icon</dc:title>
-        <dc:date
-           id="date1608">2004-07-14</dc:date>
-        <dc:creator
-           id="creator1610">
-          <cc:Agent
-             id="Agent1611">
-            <dc:title
-               id="title1612">Tobias Kieslich</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:coverage
-           id="coverage1614" />
-        <cc:license
-           id="license1616"
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"
-         id="License1624">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction"
-           id="permits1625" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution"
-           id="permits1626" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice"
-           id="requires1627" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"
-           id="permits1628" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike"
-           id="requires1629" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode"
-           id="requires1630" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:url(#radialGradient1950);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:1.0000000pt;"
-     id="path1827"
-     sodipodi:cx="29.010935"
-     sodipodi:cy="58.727592"
-     sodipodi:rx="23.157850"
-     sodipodi:ry="23.157850"
-     d="M 52.168785 58.727592 A 23.157850 23.157850 0 1 0 5.8530846,58.727592 A 23.157850 23.157850 0 1 0 52.168785 58.727592 z"
-     transform="matrix(2.556262,0.000000,0.000000,0.770827,-8.357083,60.08188)" />
-  <g
-     id="g1084"
-     transform="matrix(4.277757,0.000000,0.000000,4.277757,-244.4442,-256.4384)">
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#000000;stroke-width:2.5581360;"
-       d="M 70.183754,64.486103 C 70.970246,65.122765 71.746941,65.771669 72.540115,66.399985 C 69.453580,66.550314 66.336707,66.536916 63.267234,66.751339 C 61.553800,66.933280 62.119503,69.750024 63.656883,69.617641 C 64.925860,69.617641 66.194837,69.617641 67.463814,69.617641 C 64.899642,71.537080 62.334113,73.454704 59.769421,75.373447 C 57.974777,76.830324 59.759220,79.624301 61.528139,78.790956 C 62.843668,78.218932 63.672855,76.918567 64.775590,76.029244 C 65.272386,75.762533 66.061744,74.237148 66.195454,75.421789 C 66.812356,77.527269 68.113458,79.532317 70.023285,80.657078 C 78.453997,86.618341 88.293096,75.890516 82.467250,70.321032 C 81.347167,68.630878 79.527221,67.572142 77.996121,66.287702 C 76.220705,64.972085 74.509428,63.515316 72.695293,62.285243 C 70.961182,60.910865 68.645443,63.114782 70.183754,64.486103 z "
-       id="path1829"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.63953400pt;"
-       d="M 70.479501,64.479682 C 71.265993,65.116344 72.042688,65.765247 72.835862,66.393564 C 69.749327,66.543893 66.632454,66.530495 63.562981,66.744917 C 61.849547,66.926859 62.415250,69.743603 63.952630,69.611219 C 65.221607,69.611219 66.490584,69.611219 67.759561,69.611219 C 65.195389,71.530659 62.629860,73.448283 60.065168,75.367025 C 58.270524,76.823903 60.054967,79.617880 61.823886,78.784535 C 63.139415,78.212510 63.968602,76.912146 65.071337,76.022823 C 65.568133,75.756111 66.357491,74.230727 66.491201,75.415368 C 67.108103,77.520848 68.409205,79.525896 70.319032,80.650657 C 78.749744,86.611920 88.588843,75.884095 82.762997,70.314611 C 81.642914,68.624457 79.822968,67.565721 78.291868,66.281281 C 76.516452,64.965664 74.805175,63.508895 72.991040,62.278821 C 71.256929,60.904444 68.941190,63.108361 70.479501,64.479682 z "
-       id="path1831"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#345c87;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.4483387;"
-       id="path1832"
-       sodipodi:cx="28.791338"
-       sodipodi:cy="24.460691"
-       sodipodi:rx="5.3983760"
-       sodipodi:ry="5.0384841"
-       d="M 34.189714 24.460691 A 5.3983760 5.0384841 0 1 0 23.392962,24.460691 A 5.3983760 5.0384841 0 1 0 34.189714 24.460691 z"
-       transform="matrix(0.822413,0.000000,0.000000,0.822413,51.33976,53.33570)" />
-  </g>
-</svg>
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 4fe433b89..5978c8b5e 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121271 2011-04-30 00:03:52Z andrea $
+# $Id: PKGBUILD 122436 2011-05-04 06:56:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.92
+pkgver=4.93
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
         'rc.bluetooth')
-md5sums=('33bb9a75239889c5ee5fbc666ad41c5c'
+md5sums=('f60027b7c3bf0f9d24b5935d5f51477e'
          '8f60a5eb9d84b9c64c478d63e1c24b10'
          'ca4c39eb4bb201bd2eacad01492cd735')
 
@@ -44,11 +44,12 @@ build() {
     --enable-tools \
     --enable-bccmd \
     --enable-dfutool \
+    --enable-hid2hci \
     --enable-hidd \
     --enable-pand \
     --enable-dund \
     --enable-cups \
-    --enable-udevrules \
+    --disable-udevrules \
     --enable-configfiles
   make
 }
diff --git a/testing/dcron/PKGBUILD b/extra/dcron/PKGBUILD
index 5583d9267..5583d9267 100644
--- a/testing/dcron/PKGBUILD
+++ b/extra/dcron/PKGBUILD
diff --git a/testing/dcron/dcron.install b/extra/dcron/dcron.install
index df23d0224..df23d0224 100644
--- a/testing/dcron/dcron.install
+++ b/extra/dcron/dcron.install
diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD
index ca60ae568..d896ab734 100644
--- a/extra/ebook-tools/PKGBUILD
+++ b/extra/ebook-tools/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 90915 2010-09-18 23:05:52Z giovanni $
+# $Id: PKGBUILD 122449 2011-05-04 07:27:45Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ebook-tools
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools for accessing and converting various ebook file formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ebook-tools"
 license=('custom')
 depends=('libzip' 'libxml2')
 makedepends=('pkgconfig' 'cmake')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045')
 
 build() {
-  cd $srcdir
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 
-  install -D ${srcdir}/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/evolution-sharp/PKGBUILD b/extra/evolution-sharp/PKGBUILD
index 1dc7b6742..edd8a44bf 100644
--- a/extra/evolution-sharp/PKGBUILD
+++ b/extra/evolution-sharp/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 94159 2010-10-04 20:47:03Z ibiru $
+# $Id: PKGBUILD 122598 2011-05-04 19:22:42Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-sharp
 pkgver=0.21.1
-pkgrel=2
+pkgrel=3
 pkgdesc="C# bindings for Novell Evolution"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/"
-depends=('evolution-data-server>=2.32.0')
-makedepends=('pkg-config' 'gtk-sharp-2>=2.12.8')
+depends=('evolution-data-server')
+makedepends=('pkg-config' 'gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.21/${pkgname}-${pkgver}.tar.bz2
         evolution-sharp-0.21.1-fix-retarded-version-check.patch
         evolution-data-server-lib-target.patch)
 sha256sums=('3cb78088e332f71b2a7958d2e8c6af3c9ff168731c8fb423aad7038cbdef3a1c'
             '80f98baf3336383241deac73c3f0d3a0905c9a2a3790db7ec4bf6089a577cf5b'
-            '177492c896d6cfc34f728d578e6948463f16ed731ffbf6aa555f9ec4b7f7af9e')
+            '910783e0213002d40d3111b0a5bc5103ca21a8d1a33bd1a305238dc147cf1401')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,12 +25,11 @@ build() {
   patch -Np1 -i "${srcdir}/evolution-data-server-lib-target.patch"
   autoreconf -fi
 
-  export MONO_SHARED_DIR="${startdir}/src/.wabi"
+  export MONO_SHARED_DIR="${srcdir}/.wabi"
   mkdir -p "${MONO_SHARED_DIR}"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static
   make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/lib/libevolutionglue.a"
-} 
-
+}
diff --git a/extra/evolution-sharp/evolution-data-server-lib-target.patch b/extra/evolution-sharp/evolution-data-server-lib-target.patch
index c713b1ca4..a2e7b82a4 100644
--- a/extra/evolution-sharp/evolution-data-server-lib-target.patch
+++ b/extra/evolution-sharp/evolution-data-server-lib-target.patch
@@ -1,15 +1,16 @@
 diff -Nur evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in
 --- evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in	2009-05-26 00:25:06.000000000 -0700
-+++ evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in	2010-10-04 13:31:36.573339607 -0700
++++ evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in	2011-05-04 12:14:58.087467727 -0700
 @@ -1,7 +1,7 @@
  <configuration>
 -  <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.@EBOOK_SOVERSION@@LIB_SUFFIX@"/>
 -  <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.@ECAL_SOVERSION@@LIB_SUFFIX@"/>
 -  <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.@EDS_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/>
 +  <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.10@LIB_SUFFIX@"/>
 +  <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.8@LIB_SUFFIX@"/>
 +  <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.14@LIB_SUFFIX@"/>
-   <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/>
--  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/>
-+  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.10@LIB_SUFFIX@"/>
++  <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.1@LIB_SUFFIX@"/>
++  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.11@LIB_SUFFIX@"/>
  </configuration>
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index ebfebbd14..a7f0f6536 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $
+# $Id: PKGBUILD 122612 2011-05-05 01:46:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.3
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-url='http://cle.linux.org.tw/gcin/download/'
+url='http://cle.linux.org.tw/trac/'
 depends=('gtk2' 'libxtst')
 makedepends=('qt' 'gtk3' 'anthy')
 optdepends=('qt: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method')
-source=("${url}${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
         'fix_x86_64_libdir.patch'
         'fix_qt4_paths.patch')
-sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51'
+sha1sums=('50522908d3e64319baafb5317c0b4327bbe0fb18'
           'e5c113e50420bf4750f5547641df6ec4b7e437e0'
           '16d004424caed541d5baaa6874f708b1c138ab08')
 
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 9745b642e..d1fcb285c 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 87283 2010-08-11 20:42:35Z andyrtr $
+# $Id: PKGBUILD 122412 2011-05-04 06:25:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
-pkgver=5.2.6
+pkgver=5.2.7
 pkgrel=1
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 install=gutenprint.install
-depends=('readline' 'gnutls>=2.8.5') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
-makedepends=('gimp>=2.6.8' 'gtk2>=2.18.6' 'cups>=1.4.2' 'foomatic-db-engine' 'ghostscript>=8.71')
+depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
+makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02')
 optdepends=('cups:		to use cups printer spooler(recommended)'
             'foomatic-db-engine:	to use foomatic spooler'
             'ghostscript:	adds postscript support for ijsgutenprint'
@@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
 options=('!libtool' '!emptydirs')
-md5sums=('1f0d0cbef6c089f4f095e21869fa70db')
+md5sums=('b19029972bf28f6efd693270daf8f5de')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index ecc352ab3..4a974bd14 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,10 +1,11 @@
+# $Id: PKGBUILD 122530 2011-05-04 11:32:45Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=hdf5
-pkgver=1.8.5_patch1
+pkgver=1.8.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,7 +15,7 @@ depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-md5sums=('27308a145e6c208d57db3f6f2634a0f6')
+sha1sums=('348bd881c03a9568ac4ea9071833d6119c733757')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
@@ -29,13 +30,13 @@ build() {
     --docdir=/usr/share/doc/hdf5/ \
     --with-pthread=/usr/lib/ \
     --disable-sharedlib-rpath
-  make || return 1
+  make
 }
 
 package() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
 
-  make -j1 prefix=$pkgdir/usr install
+  make -j1 DESTDIR=${pkgdir} install
 
   install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
   install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 93e781170..b3d455918 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,8 +3,9 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110502
-_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61
+epoch=1
+pkgver=git20110323
+_commit=986cae8974998213496a8678ad03523dba83e69d
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,10 +15,15 @@ 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=('6ac9e04cb917a8ac875b2bffde4b5420')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}"
+        'nm-09.patch')
+md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04'
+         'b7ad3dac9a5022c99dfd2ad0dc8549cb')
 
 build() {
+  cd "${srcdir}/networkmanagement"
+  patch -p1 -i "${srcdir}/nm-09.patch"
+
   cd "${srcdir}"
   mkdir build
   cd build
@@ -32,3 +38,5 @@ package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('8373cd729b12a821b28b483e3e9d253f'
+         'c46839bc0503f2dbec76282b8ab163bd')
diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch
new file mode 100644
index 000000000..52b875513
--- /dev/null
+++ b/extra/kdeplasma-applets-networkmanagement/nm-09.patch
@@ -0,0 +1,44 @@
+From: Lamarque V. Souza <lamarque@gmail.com>
+Date: Sun, 17 Apr 2011 00:09:43 +0000
+Subject: Fix compilation against NetworkManager-0.8.98.
+X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&amp;a=commitdiff&amp;h=e87ceccadc833e220f73d86352968655cedc0485
+---
+Fix compilation against NetworkManager-0.8.98.
+
+BUG: 271101
+---
+
+
+--- a/backends/NetworkManager/nmdbussettingsservice.cpp
++++ b/backends/NetworkManager/nmdbussettingsservice.cpp
+@@ -59,7 +59,7 @@ public:
+     QHash<QUuid, QDBusObjectPath> uuidToPath;
+ };
+ 
+-const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
++const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings");
+ const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager");
+ 
+ NMDBusSettingsService::NMDBusSettingsService(QObject * parent)
+
+--- a/backends/NetworkManager/settings/gsmdbus.cpp
++++ b/backends/NetworkManager/settings/gsmdbus.cpp
+@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap 
+   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
+     setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
+   } else {
+-      setting->setNetworktype(NM_GSM_NETWORK_ANY);
++      setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
+   }
+   if (map.contains("band")) {
+     setting->setBand(map.value("band").value<int>());
+@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
+       map.insert("apn", setting->apn());
+   if (!setting->networkid().isEmpty())
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
+-  if (setting->networktype() != NM_GSM_NETWORK_ANY) {
++  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
+   }
+ 
+
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index ab2ddfb63..ed1535009 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94460 2010-10-07 10:45:51Z ronald $
+# $Id: PKGBUILD 122517 2011-05-04 11:21:40Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc.archlinux.org>
 # Contributor: Eric Johnson <eric.archlinux.org>
 
 pkgname=libidn
-pkgver=1.19
+pkgver=1.21
 pkgrel=1
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
@@ -15,8 +15,8 @@ makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 install=libidn.install
-md5sums=('a45142126d28162014c995f969bdb5a8')
-
+sha1sums=('991d5d4e24118d7672d53ed692a8a6ab87212f8f')
+	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 8ae96209f..9696ea620 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101448 2010-11-29 09:38:40Z jgc $
+# $Id: PKGBUILD 122471 2011-05-04 08:36:03Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
 pkgver=1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64 'mips64el')
 url="http://xcb.freedesktop.org/"
@@ -14,13 +14,16 @@ conflicts=('libx11<1.1.99.2')
 options=('!libtool')
 license=('custom')
 source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2
+        xcb_auth-fix-memory-leak.patch
         libxcb-1.1-no-pthread-stubs.patch)
 sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8'
-         '3455e84642283bc91c8313af319002a20bbcbdf4')
+          '0c9246fd2ea270bfa06cb8ef93df2f8227d83c2a'
+          '3455e84642283bc91c8313af319002a20bbcbdf4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
+  patch -Np1 -i "${srcdir}/xcb_auth-fix-memory-leak.patch"
   libtoolize --force --copy
   aclocal
   autoconf
diff --git a/extra/libxcb/xcb_auth-fix-memory-leak.patch b/extra/libxcb/xcb_auth-fix-memory-leak.patch
new file mode 100644
index 000000000..d1000913a
--- /dev/null
+++ b/extra/libxcb/xcb_auth-fix-memory-leak.patch
@@ -0,0 +1,38 @@
+From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001
+From: Nick Bowler <nbowler@draconx.ca>
+Date: Thu, 11 Nov 2010 01:49:41 +0000
+Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info.
+
+If the initial get_peer_sock_name(getpeername ...) succeeds, the
+pointer to allocated memory is overwritten by the later call to
+get_peer_sock_name(getsockname ...).  Fix that up by freeing
+the allocated memory before overwriting the pointer.
+
+Signed-off-by: Nick Bowler <nbowler@draconx.ca>
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/src/xcb_auth.c b/src/xcb_auth.c
+index 1af27fc..4839b78 100644
+--- a/src/xcb_auth.c
++++ b/src/xcb_auth.c
+@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
+     if (!info->namelen)
+         goto no_auth;   /* out of memory */
+ 
+-    if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL)
++    if (!gotsockname)
+     {
+-        free(info->name);
+-        goto no_auth;   /* can only authenticate sockets */
++        free(sockname);
++
++        if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL)
++        {
++            free(info->name);
++            goto no_auth;   /* can only authenticate sockets */
++        }
+     }
+ 
+     ret = compute_auth(info, authptr, sockname);
+--
+cgit v0.8.3-6-g21f6
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 916dfd2da..5c485cce0 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 77453 2010-04-13 12:26:29Z andrea $
+# $Id: PKGBUILD 122444 2011-05-04 07:26:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libzip
-pkgver=0.9.3
+pkgver=0.10
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
@@ -11,16 +11,20 @@ license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 options=('!libtool')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9')
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'fix-headers.patch')
+md5sums=('47cdfcbc08c8bea0b52fdee4bf591622'
+         '249395bd3a426c4c4e993e9d4753e1dd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/fix-headers.patch"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/libzip/fix-headers.patch b/extra/libzip/fix-headers.patch
new file mode 100644
index 000000000..759171070
--- /dev/null
+++ b/extra/libzip/fix-headers.patch
@@ -0,0 +1,15 @@
+diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am
+--- libzip-0.10rc1.old/lib/Makefile.am	2011-03-05 01:07:33.921722002 +0100
++++ libzip-0.10rc1/lib/Makefile.am	2011-03-05 20:29:30.349388003 +0100
+@@ -2,8 +2,9 @@
+ 
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
+-libinclude_HEADERS = zipconf.h
++include_HEADERS = \
++	zip.h \
++	zipconf.h
+ 
+ # also update CMakeLists.txt when changing version
+ libzip_la_LDFLAGS=-no-undefined -version-info 2:0
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index ecbabb486..fcd327069 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,31 +1,38 @@
-# $Id: PKGBUILD 117234 2011-03-30 11:00:13Z juergen $
+# $Id: PKGBUILD 122501 2011-05-04 10:25:04Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.23.2
-pkgrel=3
+pkgver=5.24.0
+pkgrel=1
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://maxima.sourceforge.net"
 depends=('sbcl=1.0.47' 'texinfo' 'sh')
+makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
 # needs a rebuild when sbcl changes version
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-md5sums=('ae2f2eaca33de95636e36652ed281902'
-         '24aa81126fbb8b726854e5a80d4c2415')
-sha1sums=('f7300058faf730ce6cf63c18e59ec068df01b4a6'
+sha1sums=('13586c1221bb5f36067a4cce1e6d5fb31e44e41c'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # set correct python executable to create docs
+  sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
+	
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
 	--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   
   # install some freedesktop.org compatibility
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 00c16135b..14f66eb60 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 118802 2011-04-07 20:14:30Z andyrtr $
+# $Id: PKGBUILD 122421 2011-05-04 06:44:02Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.3.3 #_git${_gitdate}
-pkgrel=2
+pkgver=0.3.5 #_git${_gitdate}
+pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -18,7 +18,7 @@ optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
 	#midori-${_gitdate}.tar.bz2
 )
-md5sums=('e1262cc7cc0c1773c331ab794480f037')
+md5sums=('f92f0f11276d63150fd321dc08d575fb')
 
 # source PKGBUILD && mksource
 mksource() {
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index c1b40bd2b..1259b3b7e 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 82759 2010-06-16 18:15:09Z ibiru $
+# $Id: PKGBUILD 122603 2011-05-04 20:10:03Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.4
+pkgver=0.4.996
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 license=('GPL2')
-depends=('dbus-glib>=0.86' 'udev>=151' 'ppp>=2.4.5')
+depends=('dbus-glib' 'udev' 'ppp')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://download.gnome.org/sources/${_realname}/0.4/${_realname}-${pkgver}.tar.bz2)
-sha256sums=('8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f')
+optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
+sha256sums=('4e82b8ef5f5e5e737212b8d077a59ac9e1fb21b65e8df98005b2beaad265c16b')
 
 build() {
   cd "$srcdir/${_realname}-${pkgver}"
@@ -20,6 +21,10 @@ build() {
    	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--disable-static
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/${_realname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 32cec1b97..37a064a87 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122004 2011-05-01 11:09:24Z ibiru $
+# $Id: PKGBUILD 122476 2011-05-04 09:08:28Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,8 +6,8 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.8.998
-pkgrel=2
+pkgver=0.8.999
+pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -19,13 +19,11 @@ makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool')
 install=network-manager-applet.install
-source=(ftp://ftp.archlinux.org/other/networkmanager/$pkgname-$pkgver-20110501.tar.xz)
-#source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d83a489766b3f04c80444697f4aacbd6c8e53a9ea31d9a5348f165eb20504438')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('95249953fad924240fbe85ae7742405622c7edc3c6391dcb823346d5c37fd63b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 219b95244..46b500642 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 122013 2011-05-01 11:25:47Z ibiru $
+# $Id: PKGBUILD 122496 2011-05-04 09:27:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.8.998
+pkgver=0.8.999
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf' 'libgnome-keyring')
-makedepends=('intltool')
+makedepends=('intltool' 'namcap')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-openconnect-${pkgver}-20110501.tar.xz)
-#source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
-sha256sums=('7f18ce15d985037c1bcf7208555182c296ab1a42a4dc33f78e5ceeb3492cdba5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
+sha256sums=('e191c71ff23268eac427609aeb0fb3df7bb1b6da2645bac84c62872cdfc218f5')
 
 build() {
   cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
-  ./autogen.sh
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 05bc1d322..7463def53 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 118022 2011-04-05 06:52:18Z heftig $
+# $Id: PKGBUILD 122487 2011-05-04 09:23:49Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.8.998
+pkgver=0.8.999
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2)
-sha256sums=('8c95cf23b5f6abc07f3b7383bb47a4be32d6232046b2a89d5259cc96e9c25d3c')
+sha256sums=('be1837025226b9f85621b32d0ebe5f971a4fb7e9094c39f89ce1af7403ee8da1')
 
 build() {
   cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 579bfb7f6..ff234bf25 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 118030 2011-04-05 06:53:52Z heftig $
+# $Id: PKGBUILD 122486 2011-05-04 09:21:32Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.8.998
+pkgver=0.8.999
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2)
-sha256sums=('2cc2093dd2d81b0c4f82d44a8589f8c867c6b88ef0d8801631bd417f8480b9b9')
+sha256sums=('81cfbe647c1d155a9bf0e7e4d4f3fad4b54dce50fd7162964e7a0f5c85fb2325')
 
 build() {
   cd "${srcdir}/NetworkManager-pptp-${pkgver}"
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index 9c2dbf41f..ad33dc5f0 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 118033 2011-04-05 06:54:12Z heftig $
+# $Id: PKGBUILD 122481 2011-05-04 09:16:50Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.8.998
+pkgver=0.8.999
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme'
-         'gtk-update-icon-cache')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
+         'gtk3' 'libgnome-keyring')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2)
-sha256sums=('996ae3b504ad49433955baa6467f828fd161a7fbe16c7080fdcab7f7c5b92fc6')
+sha256sums=('b3802070fb25872c9cc59d82bee27b6f8ec3c3feb36b5fd148a7da2b6371c3f3')
 
 build() {
   cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index e9e534238..4c7617bff 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122001 2011-05-01 11:08:27Z ibiru $
+# $Id: PKGBUILD 122462 2011-05-04 08:30:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -6,8 +6,8 @@
 # Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
 pkgname=networkmanager
-pkgver=0.8.998
-pkgrel=3
+pkgver=0.8.999
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -22,10 +22,9 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
-source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-${pkgver}-20110501.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('f9362e5db1f700df927c5ce5a4089e67270a0ce8ca9ab1c5384ae93d2d8ec0e2'
+sha256sums=('fc2430e4babe1f53ac071746cd3f662f064a7d338f0e324f42f82fe9512968cd'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
 
@@ -34,7 +33,6 @@ build() {
 
   patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
 
-  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index faafa575d..b90751d34 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 109758 2011-02-12 15:04:53Z schiv $
+# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=opencv
 _realname=OpenCV
 pkgver=2.2.0
-pkgrel=3
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
@@ -18,18 +18,19 @@ optdepends=('eigen'
             'python2-numpy')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2
-        ptrcvcapture.patch)
+        ptrcvcapture.patch
+        gcc46.patch
+        v4l_2.6.38.patch)
 md5sums=('122c9ac793a46854ef2819fedbbd6b1b'
-         '461a8b1b0f2264521e13d9ae051d13be')
+         '461a8b1b0f2264521e13d9ae051d13be'
+         'b5fb8d6786578ae7bf272615279e8865'
+         '82c8a8a76275acd4a73a4f8e948c3f78')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
   # Please do not remove any patches from trunk #
 
-  # libpng 1.4 compatibility
-  #patch -Np1 -i "$srcdir/libpng-1.4.patch"
-
   # fix v4l issue
   #patch -Np0 -i "$srcdir/v4l-mmap.patch"
 
@@ -41,6 +42,14 @@ build() {
   # see https://bugs.archlinux.org/task/22841
   patch -Np0 -i "$srcdir/ptrcvcapture.patch"
 
+  # gcc 4.6 compatibility
+  # see https://bugs.archlinux.org/task/23741
+  patch -Np3 -i "$srcdir/gcc46.patch"
+
+  # distro kernel no longer has v4l1
+  # see https://bugs.archlinux.org/task/23826
+  patch -Np1 -i "$srcdir/v4l_2.6.38.patch"
+
   cmake . -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_SKIP_RPATH=ON \
diff --git a/testing/opencv/gcc46.patch b/extra/opencv/gcc46.patch
index a69499b4f..a69499b4f 100644
--- a/testing/opencv/gcc46.patch
+++ b/extra/opencv/gcc46.patch
diff --git a/extra/opencv/libpng-1.4.patch b/extra/opencv/libpng-1.4.patch
deleted file mode 100644
index c34c5a58a..000000000
--- a/extra/opencv/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp
---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp	2010-01-21 01:08:46.000000000 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp	2010-01-21 01:13:11.000000000 -0500
-@@ -223,7 +223,7 @@
-                 png_set_palette_to_rgb( png_ptr );
- 
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                png_set_expand_gray_1_2_4_to_8( png_ptr );
- 
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/testing/opencv/v4l_2.6.38.patch b/extra/opencv/v4l_2.6.38.patch
index dd23cd133..dd23cd133 100644
--- a/testing/opencv/v4l_2.6.38.patch
+++ b/extra/opencv/v4l_2.6.38.patch
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 36f180814..70d8a705e 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 105850 2011-01-13 11:54:50Z pierre $
+# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
-pkgver=3.1.7
+pkgver=3.1.8
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
@@ -11,7 +11,7 @@ depends=('php')
 license="PHP"
 source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
 backup=('etc/php/conf.d/apc.ini')
-md5sums=('94239866e5d1b90e02675e988a5cbad4')
+md5sums=('bb1147933a61aa70ceffe53cc6f2920f')
 
 build() {
 	cd $srcdir/APC-$pkgver
diff --git a/extra/python2-cairo/PKGBUILD b/extra/python2-cairo/PKGBUILD
index 5e7f06e1f..5629199d2 100644
--- a/extra/python2-cairo/PKGBUILD
+++ b/extra/python2-cairo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102340 2010-12-07 11:21:30Z jgc $
+# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=python2-cairo
-pkgver=1.8.10
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Python2 bindings for the cairo graphics library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,17 +12,21 @@ options=('!libtool')
 provides=("pycairo=${pkgver}")
 conflicts=('pycairo')
 replaces=('pycairo')
-source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.gz)
+source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2)
 url="http://www.cairographics.org/pycairo"
-md5sums=('87421a6a70304120555ba7ba238f3dc3')
+md5sums=('20337132c4ab06c1146ad384d55372c5')
 
 build() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr
-  make
+  cd "${srcdir}/py2cairo-${pkgver}"
+  sed -i 's:bin/env python:bin/env python2:' waf
+  python2 ./waf --version
+  pushd .waf-*
+  popd
+  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr
+  PYTHON=/usr/bin/python2 ./waf build
 }
 
 package() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/py2cairo-${pkgver}"
+  PYTHON=/usr/bin/python2 ./waf install --destdir="${pkgdir}"
 }
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index c691233ea..b3fc7aacd 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117207 2011-03-29 18:21:55Z andrea $
+# $Id: PKGBUILD 122539 2011-05-04 13:21:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.2
-pkgrel=6
+pkgver=4.7.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@ options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'blacklist-fraudulent-comodo-certificates.patch')
-md5sums=('66b992f5c21145df08c99d21847f4fdb'
+        'qtconfig.desktop')
+md5sums=('49b96eefb1224cc529af6fe5608654fe'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'af1259401447f4de59f1d4c2cbedafed')
+         '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
 	unset QMAKESPEC
diff --git a/extra/qt/blacklist-fraudulent-comodo-certificates.patch b/extra/qt/blacklist-fraudulent-comodo-certificates.patch
deleted file mode 100644
index bd2da5bb3..000000000
--- a/extra/qt/blacklist-fraudulent-comodo-certificates.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 618ac79..a5cdf01 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
-     Returns true if this certificate is valid; otherwise returns
-     false.
- 
--    Note: Currently, this function only checks that the current
-+    Note: Currently, this function checks that the current
-     data-time is within the date-time range during which the
--    certificate is considered valid. No other checks are
--    currently performed.
-+    certificate is considered valid, and checks that the
-+    certificate is not in a blacklist of fraudulent certificates.
- 
-     \sa isNull()
- */
- bool QSslCertificate::isValid() const
- {
-     const QDateTime currentTime = QDateTime::currentDateTime();
--    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
-+    return currentTime >= d->notValidBefore &&
-+            currentTime <= d->notValidAfter &&
-+            ! QSslCertificatePrivate::isBlacklisted(*this);
- }
- 
- /*!
-@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
-     return certificates;
- }
- 
-+// These certificates are known to be fraudulent and were created during the comodo
-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
-+static const char *certificate_blacklist[] = {
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    0
-+};
-+
-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
-+{
-+    for (int a = 0; certificate_blacklist[a] != 0; a++) {
-+        if (certificate.serialNumber() == certificate_blacklist[a])
-+            return true;
-+    }
-+    return false;
-+}
-+
- #ifndef QT_NO_DEBUG_STREAM
- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
- {
-diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
-index cdceb0f..1ce33d3 100644
---- a/src/network/ssl/qsslcertificate_p.h
-+++ b/src/network/ssl/qsslcertificate_p.h
-@@ -96,6 +96,7 @@ public:
-     static QSslCertificate QSslCertificate_from_X509(X509 *x509);
-     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
-     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
-+    static bool isBlacklisted(const QSslCertificate &certificate);
- 
-     friend class QSslSocketBackendPrivate;
- 
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 0866534..2427193 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
-+    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-+        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+        emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+        plainSocket->disconnectFromHost();
-+        return false;
-+    }
- 
-     // Start translating errors.
-     QList<QSslError> errors;
diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD
index c753541fc..7c0873eb7 100644
--- a/extra/texlive-bin/PKGBUILD
+++ b/extra/texlive-bin/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=texlive-bin
 pkgver=2010.1
-_luatex_ver=0.62.0
-pkgrel=7
+_luatex_ver=0.66.0
+pkgrel=8
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv')
+depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
@@ -20,7 +20,9 @@ source=('texmf.cnf'
         'dvipng-fix-options.patch'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20100926.tar.xz'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20101105.tar.xz'
-        "http://foundry.supelec.fr/gf/download/frsrelease/381/1533/luatex-beta-${_luatex_ver}.tar.bz2")
+        #"http://foundry.supelec.fr/gf/download/frsrelease/387/1715/luatex-beta-${_luatex_ver}-source.tar.bz2"
+        "ftp://ftp.archlinux.org/other/texlive/luatex-svn4193.tar.xz"
+)
 backup=(etc/texmf/web2c/texmf.cnf \
   etc/texmf/chktex/chktexrc \
 	etc/texmf/web2c/mktex.cnf \
@@ -35,6 +37,14 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/dvipdfm/config/config \
 	etc/texmf/xdvi/XDvi)
 
+md5sums=('626f900fb59f036d6fea95f08c74b00b'
+         'bfb9716aa00c86c08cd31e5b32edeb98'
+         '393a4bf67adc7ca5df2b386759d1a637'
+         '60e405158f53519348d9783e8d420670'
+         '0b2c3a4a1b1e4befb90d7fbb5f08a6e9'
+         '7ae1400dafdb079dcd08d233de83ec44'
+         '523802a23bc174374403415d9cc87946')
+
 build() {
    if [ "${CARCH}" = "x86_64" ]; then
      export CFLAGS="${CFLAGS} -fPIC"
@@ -43,7 +53,8 @@ build() {
 
    cd $srcdir
    # Building LuaTeX
-   cd luatex-beta-${_luatex_ver}
+   #cd luatex-beta-${_luatex_ver}
+   cd luatex
    patch -p0 -i ../fix-fontforge-encoding.patch
    mkdir build
    cd build
@@ -67,6 +78,7 @@ build() {
     --with-system-libpng \
     --without-system-teckit \
     --with-system-zlib \
+    --with-system-zziplib \
     --with-system-t1lib \
     --disable-shared \
     --disable-largefile \
@@ -74,7 +86,6 @@ build() {
     --without-mf-x-toolkit \
     --without-x
    make
-   make -C libs/zziplib
    make -C libs/obsdcompat
    make -C texk/kpathsea
    make -C texk/web2c luatex
@@ -224,7 +235,8 @@ package() {
    done
 
    ## install luatex binary
-   install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
+   #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
+   install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/
    cd $pkgdir/usr/bin
    /bin/ln -s luatex texlua
    /bin/ln -s luatex texluac
@@ -247,47 +259,90 @@ package() {
    echo "--> Create symlinks for TeX formats ..."
    PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
    #############################################################
-   # remove symlinks to scripts that are not in texlive-bin or texlive-core:
-   SYMLINKS_TO_REMOVE="authorindex \
-ebong \
-bibexport \
-cachepic \
-epspdf \
-epspdftk \
-fig4latex \
+   # remove dangling symlinks
+   _bibtexextra_scripts="bibexport"
+   _core_scripts="
+afm2afm
+arlatex
+autoinst
+bundledoc
+cmap2enc
+de-macro
+dviasm
+epstopdf
+findhyph
+font2afm
+fragmaster
+installfont-tl
+latex2man
+latexdiff
+latexdiff-vc
+latexmk
+latexrevise
+listings-ext.sh
+mkjobtexmf
+mkluatexfontdb
+mkt1font
+mptopdf
+ot2kpx
+pdf180
+pdf270
+pdf90
+pdfatfi
+pdfbook
+pdfcrop
+pdfflip
+pdfjam
+pdfjam-pocketmod
+pdfjam-slides3up
+pdfjam-slides6up
+pdfjoin
+pdfnup
+pdfpun
+pfm2kpx
+pkfix
+pkfix-helper
+purifyeps
+repstopdf
+rpdfcrop
+showglyphs
+texcount
+texdiff
+texdirflatten
+texloganalyser
+thumbpdf
+vpl2ovp
+vpl2vpl
+"
+   _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
+   _langextra_scripts="ebong"
+   _langgreek_scripts="mkgrkindex"
+   _latexextra_scripts="authorindex \
 makeglossaries \
-mathspic \
-mkgrkindex \
 pdfannotextractor \
-perltex \
 pdfthumb \
+perltex \
 ppower4 \
-pst2pdf \
 ps4pdf \
 splitindex \
 svn-multi \
-htcontext \
-htlatex \
-htmex \
-ht \
-httexi \
-httex \
-htxelatex \
-htxetex \
-mk4ht \
-ulqda \
-vpe \
-tlmgr"
-   for s in $SYMLINKS_TO_REMOVE; do
+vpe"
+   _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
+   _pstricks_scripts="pst2pdf"
+   _science_scripts="ulqda"
+   for s in \
+        ${_bibtexextra_scripts} \
+        ${_core_scripts} \
+        ${_htmlxml_scripts}    \
+        ${_langextra_scripts}  \
+        ${_langgreek_scripts}  \
+        ${_latexextra_scripts} \
+        ${_pictures_scripts}   \
+        ${_pstricks_scripts}   \
+        ${_science_scripts}    \
+        tlmgr; do
      rm -f $pkgdir/usr/bin/$s
    done
    ###################################################################
 }
 
-md5sums=('626f900fb59f036d6fea95f08c74b00b'
-         'bfb9716aa00c86c08cd31e5b32edeb98'
-         '393a4bf67adc7ca5df2b386759d1a637'
-         '60e405158f53519348d9783e8d420670'
-         '0b2c3a4a1b1e4befb90d7fbb5f08a6e9'
-         '7ae1400dafdb079dcd08d233de83ec44'
-         '4b22a50866849ec14886906474a72a01')
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
deleted file mode 100644
index d561a25da..000000000
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 46021 2011-05-02 00:26:22Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils-multilib
-pkgver=2.21
-pkgrel=7
-_date=20110430
-pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('multilib-devel')
-provides=("binutils=$pkgver-$pkgrel")
-conflicts=('binutils')
-depends=('glibc>=2.13' 'zlib')
-makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared \
-    --enable-64-bit-bfd --enable-multilib
-
-  # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
-  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/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-testing/binutils-multilib/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index 4a5a69628..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,305 +0,0 @@
-# $Id: PKGBUILD 46019 2011-05-02 00:10:26Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.0
-pkgrel=4
-_snapshot=4.6-20110429
-_libstdcppmanver=20110201		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu'
-             'lib32-glibc>=2.12.1')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_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=('fa586a5634ae3b462c5fb2d55160b14f'
-         '2591b1fad977f7bd6136c9ac1298ef04'
-         '366f93c1867f35c8860b42965efde955'
-         '21779792ef7e0ed7abef611160b0099c'
-         'cf518c56b968925a2eca3aa2b4cdbd7b'
-         'f66ef8597b99961eda7573df505ea354'
-         '3d89dd233ceb6a837d14ee6b940a43ed'
-         '1e9fd2eaf0ee47ea64e82c48998f1999'
-         '22cec272f9cc2801d3cd348feaca888b'
-         '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libstdcxx-pch \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.11.1-2' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp 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 stuff in lib32-gcc-libs
-  rm -rf ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.12.1' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libssp libstdc++-v3/src; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog' 'ppl'
-           "gcc-libs-multilib=$pkgver-$pkgrel")
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
-  pkgdesc="Fortran front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-fortran=$pkgver-$pkgrel")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
deleted file mode 100644
index 8c6b08171..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64.patch
+++ /dev/null
@@ -1,24 +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,7 +49,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD
index 0c1886616..e74ba71f2 100644
--- a/multilib/binutils-multilib/PKGBUILD
+++ b/multilib/binutils-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43542 2011-03-27 14:09:06Z heftig $
+# $Id: PKGBUILD 46021 2011-05-02 00:26:22Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -6,8 +6,8 @@
 
 pkgname=binutils-multilib
 pkgver=2.21
-pkgrel=6
-_date=20110326
+pkgrel=7
+_date=20110430
 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
 arch=('x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
@@ -20,7 +20,7 @@ makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-mult
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('884dcbc87d4722b152aea72312356da1')
+md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec')
 
 build() {
   cd ${srcdir}
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index 6a9ff2421..1e02407eb 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45100 2011-04-16 13:45:55Z heftig $
+# $Id: PKGBUILD 46019 2011-05-02 00:10:26Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,8 +8,8 @@
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.6.0
-pkgrel=3
-_snapshot=4.6-20110415
+pkgrel=4
+_snapshot=4.6-20110429
 _libstdcppmanver=20110201		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64' 'mips64el')
@@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
 	gcc-hash-style-both.patch)
-md5sums=('aed037654091d1f478dfcb6e13444325'
-         '8d4b78c03c1d477c6cb562d42f461958'
-         'c346e76014569b25e2869ff986d2ac2d'
-         '8376485de1c7aa90bb32f52f2372d451'
-         '0c2d89f9e2e614ad84c6e2aa239c5c1c'
-         '50bab6a0c9e5403ea77f57361dec5436'
-         '6e0032461f87ce60db6302ca652ae9d8'
+md5sums=('fa586a5634ae3b462c5fb2d55160b14f'
+         '2591b1fad977f7bd6136c9ac1298ef04'
+         '366f93c1867f35c8860b42965efde955'
+         '21779792ef7e0ed7abef611160b0099c'
+         'cf518c56b968925a2eca3aa2b4cdbd7b'
+         'f66ef8597b99961eda7573df505ea354'
+         '3d89dd233ceb6a837d14ee6b940a43ed'
          '1e9fd2eaf0ee47ea64e82c48998f1999'
          '22cec272f9cc2801d3cd348feaca888b'
          '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/multilib/lib32-libcanberra/PKGBUILD b/multilib/lib32-libcanberra/PKGBUILD
index 581fd78ed..f4dc8225e 100644
--- a/multilib/lib32-libcanberra/PKGBUILD
+++ b/multilib/lib32-libcanberra/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 35301 2010-12-18 02:01:34Z heftig $
+# $Id: PKGBUILD 46313 2011-05-05 01:10:02Z heftig $
 # Maintainer: Florian Pritz <flo@xssn.at>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libcanberra
 pkgbase=lib32-$_pkgbasename
 pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
-pkgver=0.26
-pkgrel=3
+pkgver=0.28
+pkgrel=1
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
 arch=(x86_64 'mips64el')
 license=('LGPL')
-depends=('lib32-libvorbis>=1.3.1' 'lib32-libtool>=2.2.10' 'lib32-gtk2>=2.21.8' 'lib32-alsa-lib>=1.0.23' 'lib32-tdb>=1.2.1' $_pkgbasename)
+depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb'
+         $_pkgbasename)
 makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 source=("$url/$_pkgbasename-$pkgver.tar.gz")
-md5sums=('ee2c66ada7c851a4e7b6eb1682285a24')
+md5sums=('c198b4811598c4c161ff505e4531b02c')
 
 build() {
   cd "$srcdir/$_pkgbasename-$pkgver"
@@ -26,12 +27,14 @@ build() {
 
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --disable-gstreamer --enable-pulse \
+      --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \
       --libdir=/usr/lib32
   make
 }
 
 package_lib32-libcanberra() {
+  optdepends=("$pkgbase-pulse: PulseAudio driver")
+
   cd "$srcdir/$_pkgbasename-$pkgver"
 
   make -j1 DESTDIR="${pkgdir}" install
@@ -43,7 +46,7 @@ package_lib32-libcanberra() {
   mkdir pulse-plugin
   mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin
 
-  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin}}
+  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}}
 }
 
 package_lib32-libcanberra-pulse() {
diff --git a/staging/anjuta/PKGBUILD b/staging/anjuta/PKGBUILD
new file mode 100644
index 000000000..98a1c6730
--- /dev/null
+++ b/staging/anjuta/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Harley Laue <losinggeneration@yahoo.com>
+
+pkgname=anjuta
+pkgver=3.0.1.0
+pkgrel=2
+pkgdesc="GNOME Integrated Development Environment (IDE)"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda'
+         'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz'
+         'python2' 'shared-mime-info' 'desktop-file-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+url="http://anjuta.sourceforge.net/"
+install=anjuta.install
+source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool' '!emptydirs')
+sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261')
+
+build() {
+  cd "${srcdir}/anjuta-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package(){
+  cd "${srcdir}/anjuta-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  sed -i "1s|#!/usr/bin/python$|&2|" \
+    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
+}
diff --git a/staging/anjuta/anjuta.install b/staging/anjuta/anjuta.install
new file mode 100644
index 000000000..c6fcfec11
--- /dev/null
+++ b/staging/anjuta/anjuta.install
@@ -0,0 +1,21 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-mime-database usr/share/mime > /dev/null
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall anjuta
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/staging/cifs-utils/PKGBUILD b/staging/cifs-utils/PKGBUILD
new file mode 100644
index 000000000..9c33cefba
--- /dev/null
+++ b/staging/cifs-utils/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=cifs-utils
+pkgver=4.9
+pkgrel=3
+pkgdesc="CIFS filesystem user-space tools"
+arch=(i686 x86_64)
+url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
+license=('GPL')
+depends=('libcap' 'keyutils' 'krb5' 'talloc')
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+md5sums=('908d904e6b9e58f09f530de151a88ef8')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm -r $pkgdir/usr/bin
+  # set mount.cifs uid, to enable none root mounting form fstab
+  chmod +s $pkgdir/sbin/mount.cifs
+}
diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD
new file mode 100644
index 000000000..195be21c6
--- /dev/null
+++ b/staging/evolution-data-server/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution-data-server
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
+arch=('i686' 'x86_64')
+depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
+makedepends=('intltool' 'gperf' 'gobject-introspection')
+options=('!libtool')
+url="http://www.gnome.org"
+license=('GPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --with-openldap=yes \
+      --libexecdir=/usr/lib/evolution-data-server \
+      --with-krb5=/usr --with-libdb=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD
new file mode 100644
index 000000000..963b54508
--- /dev/null
+++ b/staging/evolution-exchange/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution-exchange
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="Ximian Connector Exchange plugin for Evolution"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.ximian.com"
+depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3')
+makedepends=('intltool' 'evolution')
+options=('!libtool' '!emptydirs')
+install=evolution-exchange.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/evolution --disable-static \
+      --with-libdb=/usr --with-krb5=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install
new file mode 100644
index 000000000..1179887f9
--- /dev/null
+++ b/staging/evolution-exchange/evolution-exchange.install
@@ -0,0 +1,17 @@
+pkgname=evolution-exchange
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/staging/gnome-control-center/PKGBUILD b/staging/gnome-control-center/PKGBUILD
new file mode 100644
index 000000000..1031b6b1d
--- /dev/null
+++ b/staging/gnome-control-center/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.0.1.1
+pkgrel=2
+pkgdesc="The Control Center for GNOME"
+arch=('i686' 'x86_64')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+            'apg: adds password generation for user accounts')
+makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --disable-scrollkeeper --disable-update-mimedb
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/staging/gnome-control-center/gnome-control-center.install b/staging/gnome-control-center/gnome-control-center.install
new file mode 100644
index 000000000..eb703319f
--- /dev/null
+++ b/staging/gnome-control-center/gnome-control-center.install
@@ -0,0 +1,19 @@
+pkgname=gnome-control-center
+
+post_install() {
+    gtk-update-icon-cache -q -t -f 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/staging/gnome-settings-daemon/PKGBUILD b/staging/gnome-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..06f71588b
--- /dev/null
+++ b/staging/gnome-settings-daemon/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-settings-daemon
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="The GNOME Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
+         'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
+         'dconf' 'pulseaudio' 'pulseaudio-alsa')
+makedepends=('intltool' 'gtk-doc')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+groups=('gnome')
+replaces=(gnome-settings-daemon-pulse)
+conflicts=(gnome-settings-daemon-pulse)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/bin --disable-static --enable-pulse
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/gnome-settings-daemon/gnome-settings-daemon.install b/staging/gnome-settings-daemon/gnome-settings-daemon.install
new file mode 100644
index 000000000..483fb9450
--- /dev/null
+++ b/staging/gnome-settings-daemon/gnome-settings-daemon.install
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/staging/gnome-vfs/PKGBUILD b/staging/gnome-vfs/PKGBUILD
new file mode 100644
index 000000000..3474b4c22
--- /dev/null
+++ b/staging/gnome-vfs/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-vfs
+pkgver=2.24.4
+pkgrel=3
+pkgdesc="The GNOME Virtual File System"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
+options=('!libtool' '!emptydirs')
+url="http://www.gnome.org"
+install=gnome-vfs.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
+        gnutls-config.patch)
+sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
+            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  #Fix build with new gnutls
+  patch -Np1 -i "${srcdir}/gnutls-config.patch"
+  libtoolize --force
+  gtkdocize
+  aclocal
+  autoconf
+  automake
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gnome-vfs-2.0 \
+      --enable-samba --disable-hal \
+      --enable-avahi --disable-howl \
+      --disable-openssl --enable-gnutls
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/gnome-vfs/gnome-vfs.install b/staging/gnome-vfs/gnome-vfs.install
new file mode 100644
index 000000000..793a3e7ab
--- /dev/null
+++ b/staging/gnome-vfs/gnome-vfs.install
@@ -0,0 +1,17 @@
+pkgname=gnome-vfs
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/staging/gnome-vfs/gnutls-config.patch b/staging/gnome-vfs/gnutls-config.patch
new file mode 100644
index 000000000..f6fa18b17
--- /dev/null
+++ b/staging/gnome-vfs/gnutls-config.patch
@@ -0,0 +1,25 @@
+# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
+# Use pkg-config in place of gnutls own macro since it's not present anymore.
+--- a/configure.in	2009-03-07 19:59:53.805507753 +0100
++++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
+@@ -686,14 +686,14 @@
+     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
+   else
+     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
+-    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-			      have_ssl=true])
++    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++    				 	   	  have_ssl=true])
+ 
+     if test "x${LIBGNUTLS_LIBS}" = "x"; then
+-      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
+-				 have_ssl=true],
+-                                 AC_MSG_ERROR([Unable to find GNUTLS]))
++      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
++						    have_ssl=true],
++						    AC_MSG_ERROR([Unable to find GNUTLS]))
+     fi
+   fi
+ fi
diff --git a/staging/gtk3/PKGBUILD b/staging/gtk3/PKGBUILD
new file mode 100644
index 000000000..5550647fc
--- /dev/null
+++ b/staging/gtk3/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gtk3
+pkgver=3.0.9
+pkgrel=2
+pkgdesc="The GTK+ Toolkit (v3)"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
+makedepends=('gobject-introspection')
+options=('!libtool' '!docs')
+backup=(etc/gtk-3.0/settings.ini)
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2
+        settings.ini)
+sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+
+build() {
+    cd "${srcdir}/gtk+-${pkgver}"
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-gtk2-dependency \
+        --disable-schemas-compile
+    make
+}
+
+package() {
+    cd "${srcdir}/gtk+-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+
+    install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini"
+}
diff --git a/staging/gtk3/gtk3.install b/staging/gtk3/gtk3.install
new file mode 100644
index 000000000..cd8965d1f
--- /dev/null
+++ b/staging/gtk3/gtk3.install
@@ -0,0 +1,15 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+post_remove() {
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/staging/gtk3/settings.ini b/staging/gtk3/settings.ini
new file mode 100644
index 000000000..039000d38
--- /dev/null
+++ b/staging/gtk3/settings.ini
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome
diff --git a/staging/libgnomecups/PKGBUILD b/staging/libgnomecups/PKGBUILD
new file mode 100644
index 000000000..157e18f50
--- /dev/null
+++ b/staging/libgnomecups/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Paulius Palevicius <paulius@birzai.com>
+
+pkgname=libgnomecups
+pkgver=0.2.3
+pkgrel=8
+pkgdesc="GNOME cups library"
+arch=(i686 x86_64)
+license=('LGPL' 'GPL')
+url="http://www.gnome.org"
+depends=('libcups' 'glib2' 'krb5' 'gnutls')
+makedepends=('perlxml')
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
+        libgnomecups_0.2.3-ignore-ipp-not-found.patch)
+md5sums=('dc4920c15c9f886f73ea74fbff0ae48b'
+         '973a1b9d93013ce431400a14b78f5d94')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # This avoids generating huge 'IPP request failed with status 1030' lines
+  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/staging/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
new file mode 100644
index 000000000..797367bf9
--- /dev/null
+++ b/staging/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch
@@ -0,0 +1,11 @@
+--- a/libgnomecups/gnome-cups-request.c	2007-01-31 10:49:17.000000000 -0800
++++ b/libgnomecups/gnome-cups-request.c	2009-11-24 12:49:30.000000000 -0800
+@@ -349,7 +349,7 @@
+ 		if (request->response == NULL)
+ 			status = IPP_INTERNAL_ERROR;
+ 
+-		if (status > IPP_OK_CONFLICT) {
++		if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) {
+ 			g_warning ("IPP request failed with status %d", status);
+ 			if (request->error != NULL)
+ 				*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
diff --git a/staging/libgnomeprint/PKGBUILD b/staging/libgnomeprint/PKGBUILD
new file mode 100644
index 000000000..db2bfedcd
--- /dev/null
+++ b/staging/libgnomeprint/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libgnomeprint
+pkgver=2.18.8
+pkgrel=2
+pkgdesc="Printing routines for GNOME"
+arch=(i686 x86_64)
+license=('LGPL' 'GPL')
+depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls')
+makedepends=('intltool' 'pkgconfig')
+replaces=('libgnomeprint-cups')
+conflicts=('libgnomeprint-cups')
+url="http://www.gnome.org"
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/samba/PKGBUILD b/staging/samba/PKGBUILD
new file mode 100644
index 000000000..6bd883503
--- /dev/null
+++ b/staging/samba/PKGBUILD
@@ -0,0 +1,139 @@
+# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.5.8
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.5.8
+pkgrel=3
+arch=(i686 x86_64)
+url="http://www.samba.org"
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+        samba samba.logrotate
+        swat.xinetd
+        samba.pam
+        samba.conf.d
+        fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib/ \
+              --localstatedir=/var \
+              --with-configdir=/etc/samba \
+              --with-lockdir=/var/cache/samba \
+              --with-piddir=/var/run/samba \
+              --with-fhs \
+              --with-pam \
+              --with-pam_smbpass \
+              --with-pammodulesdir=/lib/security \
+              --with-ads \
+              --with-acl-support \
+              --with-cifsmount \
+              --with-libsmbclient \
+              --with-syslog \
+              --enable-external-libtalloc \
+              --disable-dnssd \
+              --disable-avahi \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --enable-external-libtdb
+  make
+}
+
+package_smbclient () {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
+  for i in libnetapi* libwbclient* libsmbclient*;do
+      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  done
+  install -m755 script/smbtar ${pkgdir}/usr/bin/
+  mkdir -p ${pkgdir}/usr/lib/cups/backend
+  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
+  mkdir -p ${pkgdir}/usr/include
+  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
+  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
+  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
+  for man in rpcclient smbcacls smbclient smbcquotas smbget \
+      smbtree smbtar nmblookup; do
+      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
+  done
+  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+}
+
+package_samba () {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+backup=(etc/logrotate.d/samba
+        etc/pam.d/samba
+        etc/samba/smb.conf
+        etc/xinetd.d/swat
+        etc/conf.d/samba)
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/samba-${_realver}/source3
+  mkdir -p ${pkgdir}/var/log/samba
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+  make DESTDIR=${pkgdir} install
+  chmod 644 ${pkgdir}/usr/include/*.h
+  rm -rf ${pkgdir}/usr/var
+  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
+  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
+  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
+  mkdir -p ${pkgdir}/etc/samba
+  cat ../examples/smb.conf.default | \
+    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
+  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
+  # spool directory
+  install -d -m1777 ${pkgdir}/var/spool/samba
+  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
+  # fix logrotate
+  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+  # nsswitch libraries
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
+  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
+  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  # remove conflict files of smbclient
+  for man in libsmbclient smbspool \
+      mount.cifs net cifs.upcall; do
+      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
+  done
+  for i in libnetapi* libwbclient* libsmbclient*;do
+      rm -f ${pkgdir}/usr/lib/$i
+  done
+  for bin in net \
+      nmblookup rpcclient smbcacls smbclient \
+      smbcquotas smbget smbspool smbtar smbtree; do
+      rm -f ${pkgdir}/usr/bin/$bin
+  done
+  rm -f ${pkgdir}/usr/sbin/cifs.upcall
+  rm -f ${pkgdir}/usr/include/netapi.h
+  for man in rpcclient smbcacls smbclient smbcquotas \
+      smbtree smbtar nmblookup smbget; do
+      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
+  done
+  for man in tdbbackup tdbdump tdbtool; do
+      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
+  done
+  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
+  rm -f ${pkgdir}/usr/include/libsmbclient.h
+  # copy ldap example
+  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
+}
+md5sums=('355b4530c20997e94aebc74cd6ea5307'
+         '891b9be03e7adf65c9a00319c76d33e5'
+         '5697da77590ec092cc8a883bae06093c'
+         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'f2f2e348acd1ccb566e95fa8a561b828'
+         'c6a38a8c8fa24979e6217aed533358ea')
diff --git a/staging/samba/fix-ipv6-mount.patch b/staging/samba/fix-ipv6-mount.patch
new file mode 100644
index 000000000..89bef6533
--- /dev/null
+++ b/staging/samba/fix-ipv6-mount.patch
@@ -0,0 +1,11 @@
+--- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
++++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
+@@ -1563,7 +1563,7 @@
+ 		}
+ 	}
+
+-	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
++	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+ 		strlcat(options, "%", options_size);
+ 		current_len = strnlen(options, options_size);
+ 		optionstail = options + current_len; 
diff --git a/staging/samba/samba b/staging/samba/samba
new file mode 100755
index 000000000..1b222d6cc
--- /dev/null
+++ b/staging/samba/samba
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
+
+[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
+
+case "$1" in
+	start)
+		rc=0
+		stat_busy "Starting Samba Server"
+		if [ ! -x /var/run/samba ] ; then
+			install -m755 -g 81 -o 81 -d /var/run/samba
+		fi
+		for d in ${SAMBA_DAEMONS[@]}; do
+			PID=`pidof -o %PPID /usr/sbin/$d`
+			[ -z "$PID" ] && /usr/sbin/$d -D
+			rc=$(($rc+$?))
+		done
+		if [ $rc -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon samba
+			stat_done
+		fi
+	;;
+	stop)
+		rc=0
+		stat_busy "Stopping Samba Server"
+		for d in ${SAMBA_DAEMONS[@]}; do
+			PID=`pidof -o %PPID /usr/sbin/$d`
+			[ -z "$PID" ] || kill $PID &> /dev/null
+			rc=$(($rc+$?))
+		done
+		if [ $rc -gt 0 ]; then
+			stat_fail
+		else
+			rm /var/run/samba/smbd.pid &>/dev/null
+			rm /var/run/samba/nmbd.pid &>/dev/null
+			rm /var/run/samba/winbindd.pid &>/dev/null
+			rm_daemon samba
+			stat_done
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/staging/samba/samba.conf.d b/staging/samba/samba.conf.d
new file mode 100644
index 000000000..8721f956a
--- /dev/null
+++ b/staging/samba/samba.conf.d
@@ -0,0 +1,7 @@
+#
+# Configuration for the samba init script
+#
+
+# space separated list of daemons to launch
+SAMBA_DAEMONS=(smbd nmbd)
+#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/staging/samba/samba.logrotate b/staging/samba/samba.logrotate
new file mode 100644
index 000000000..581f4c33b
--- /dev/null
+++ b/staging/samba/samba.logrotate
@@ -0,0 +1,9 @@
+/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
+   notifempty
+   missingok
+   sharedscripts
+   copytruncate
+   postrotate
+      /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}
diff --git a/staging/samba/samba.pam b/staging/samba/samba.pam
new file mode 100644
index 000000000..53724d1f8
--- /dev/null
+++ b/staging/samba/samba.pam
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
diff --git a/staging/samba/swat.xinetd b/staging/samba/swat.xinetd
new file mode 100644
index 000000000..2e62a82b2
--- /dev/null
+++ b/staging/samba/swat.xinetd
@@ -0,0 +1,10 @@
+service swat
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/swat
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}
diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD
deleted file mode 100644
index 68688bc51..000000000
--- a/testing/blender/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z 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.57b
-pkgrel=2
-epoch=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-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')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('e6cb5523323a71c070051e6fe6efe497')
-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"
-  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 \
-    -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 2fcf98022..000000000
--- a/testing/blender/blender.install
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-}
-
-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/bluez/PKGBUILD b/testing/bluez/PKGBUILD
deleted file mode 100644
index f59dd51d8..000000000
--- a/testing/bluez/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 122198 2011-05-02 21:32:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez
-pkgver=4.92
-pkgrel=2
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-	"alsa-lib: Audio bluetooth devices support"
-	"dbus-python: to run bluez-simple-agent"
-	"pygobject: to run bluez-simple-agent"
-	"libusb-compat: USB adapters support"
-	"cups: CUPS backend"
-	"libnl: netlink plugin")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
-        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-        'rc.bluetooth')
-md5sums=('33bb9a75239889c5ee5fbc666ad41c5c'
-         '8f60a5eb9d84b9c64c478d63e1c24b10'
-         'ca4c39eb4bb201bd2eacad01492cd735')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/lib \
-    --enable-gstreamer \
-    --enable-alsa \
-    --enable-usb \
-    --enable-tools \
-    --enable-bccmd \
-    --enable-dfutool \
-    --enable-hidd \
-    --enable-pand \
-    --enable-dund \
-    --enable-cups \
-    --disable-udevrules \
-    --enable-configfiles
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
-  
-  install -d ${pkgdir}/etc/bluetooth
-  install -m644 network/network.conf \
-                input/input.conf \
-                audio/audio.conf \
-                serial/serial.conf \
-    ${pkgdir}/etc/bluetooth/
-  
-  install -Dm644 ${srcdir}/bluetooth.conf.d \
-    ${pkgdir}/etc/conf.d/bluetooth
-
-  install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    ${pkgdir}/usr/bin/bluez-simple-agent
-}
diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d
deleted file mode 100644
index 6648740eb..000000000
--- a/testing/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-#HIDD_OPTIONS=""
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth
deleted file mode 100644
index 096242011..000000000
--- a/testing/bluez/rc.bluetooth
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="bluetoothd"
-HIDD_NAME="hidd"
-RFCOMM_NAME="rfcomm"
-PAND_NAME="pand"
-DUND_NAME="dund"
-
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-HIDD_EXEC="/usr/bin/hidd"
-RFCOMM_EXEC="/usr/bin/rfcomm"
-PAND_EXEC="/usr/bin/pand"
-DUND_EXEC="/usr/bin/dund"
-
-DAEMON_ENABLE="true"
-HIDD_ENABLE="false"
-RFCOMM_ENABLE="false"
-DUND_ENABLE="false"
-PAND_ENABLE="false"
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-HIDD_OPTIONS=""
-DUND_OPTIONS=""
-PAND_OPTIONS=""
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-case "$1" in
-  start)
-    stat_busy "Starting bluetooth subsystem:"
-    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
-      stat_append " $DAEMON_NAME"
-      $DAEMON_EXEC
-      sleep 1
-    fi
-    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
-      stat_append " $SDPD_NAME"
-      $SDPD_EXEC
-    fi
-    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
-      stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS --server
-    fi
-    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
-    fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
-    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
-      stat_append " $PAND_NAME"
-      $PAND_EXEC $PAND_OPTIONS
-    fi
-    add_daemon bluetooth
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping bluetooth subsystem:"
-
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
-    stat_append " $DUND_NAME"
-    killall $DUND_NAME >/dev/null 2>&1
-
-    if [ -x "$RFCOMM_EXEC" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC release all >/dev/null 2>&1
-    fi
-
-    stat_append " $HIDD_NAME"
-    killall $HIDD_NAME >/dev/null 2>&1
-
-    stat_append " $SDPD_NAME"
-    killall $SDPD_NAME >/dev/null 2>&1
-
-    stat_append " $DAEMON_NAME"
-    killall $DAEMON_NAME >/dev/null 2>&1
-
-    rm_daemon bluetooth
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD
index 15d70051a..428c837e3 100644
--- a/testing/cronie/PKGBUILD
+++ b/testing/cronie/PKGBUILD
@@ -3,12 +3,13 @@
 
 pkgname='cronie'
 pkgver=1.4.7
-pkgrel=7
+pkgrel=8
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('pam' 'bash' 'run-parts')
+optdepends=('smtp-server: sending cron job output via email')
 
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'cron.deny'
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
new file mode 100644
index 000000000..04c32a2fa
--- /dev/null
+++ b/testing/iproute2/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 122514 2011-05-04 11:14:51Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=iproute2
+pkgver=2.6.38
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2"
+depends=('linux-atm' 'perl')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
+	'iproute2-fhs.patch')
+sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a'
+          '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+build() {
+  cd $srcdir/iproute2-${pkgver}
+  
+  # set correct fhs structure
+  patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/iproute2-${pkgver}
+
+  make DESTDIR=$pkgdir install
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
+  install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+}
diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch
new file mode 100644
index 000000000..2608414db
--- /dev/null
+++ b/testing/iproute2/iproute2-fhs.patch
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile	2009-11-11 22:05:21.251407668 +0100
++++ iproute2-2.6.29/Makefile	2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
++++ iproute2-2.6.29/tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+ 
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+ 
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+ 
+ 	lib_dir = getenv("TC_LIB_DIR");
+ 	if (!lib_dir)
+-		lib_dir = LIBDIR "/tc/";
++		lib_dir = SHAREDIR "/tc/";
+ 
+ 	return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile	2010-08-06 11:30:48.640940183 +0200
++++ iproute2-2.6.35/netem/Makefile	2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile	2010-08-06 11:48:35.607472252 +0200
++++ iproute2-2.6.35/tc/Makefile	2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
+-	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+-	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
+-	done
+-	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+-	if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+-	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+-		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+-	fi; \
+-	fi
++	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	install -m 0755 tc $(DESTDIR)$(SBINDIR)
++	for i in $(TCSO); \
++	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	done
+ 
+ clean:
+ 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index b90751d34..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=opencv
-_realname=OpenCV
-pkgver=2.2.0
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64' 'mips64el')
-license=('BSD')
-url="http://opencv.willowgarage.com"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'doxygen'
-             'python2-numpy' 'eigen')
-optdepends=('eigen'
-            'python2-numpy')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2
-        ptrcvcapture.patch
-        gcc46.patch
-        v4l_2.6.38.patch)
-md5sums=('122c9ac793a46854ef2819fedbbd6b1b'
-         '461a8b1b0f2264521e13d9ae051d13be'
-         'b5fb8d6786578ae7bf272615279e8865'
-         '82c8a8a76275acd4a73a4f8e948c3f78')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Please do not remove any patches from trunk #
-
-  # fix v4l issue
-  #patch -Np0 -i "$srcdir/v4l-mmap.patch"
-
-  # fix ffmpeg-related C++ issue
-  # see http://code.google.com/p/ffmpegsource/source/detail?r=311
-  #export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-
-  # fix linking against highgui
-  # see https://bugs.archlinux.org/task/22841
-  patch -Np0 -i "$srcdir/ptrcvcapture.patch"
-
-  # gcc 4.6 compatibility
-  # see https://bugs.archlinux.org/task/23741
-  patch -Np3 -i "$srcdir/gcc46.patch"
-
-  # distro kernel no longer has v4l1
-  # see https://bugs.archlinux.org/task/23826
-  patch -Np1 -i "$srcdir/v4l_2.6.38.patch"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_SKIP_RPATH=ON \
-          -DWITH_XINE=ON \
-          -DWITH_UNICAP=OFF \
-          -DBUILD_EXAMPLES=ON \
-          -DBUILD_TESTS=OFF \
-          -DINSTALL_C_EXAMPLES=ON \
-          -DINSTALL_PYTHON_EXAMPLES=ON
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/opencv/ptrcvcapture.patch b/testing/opencv/ptrcvcapture.patch
deleted file mode 100644
index c1316f0ea..000000000
--- a/testing/opencv/ptrcvcapture.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: modules/highgui/src/cap.cpp
-===================================================================
---- modules/highgui/src/cap.cpp	(revision 4283)
-+++ modules/highgui/src/cap.cpp	(working copy)
-@@ -52,10 +52,10 @@
- namespace cv
- {
- 
--template<> inline void Ptr<CvCapture>::delete_obj()
-+template<> void Ptr<CvCapture>::delete_obj()
- { cvReleaseCapture(&obj); }
- 
--template<> inline void Ptr<CvVideoWriter>::delete_obj()
-+template<> void Ptr<CvVideoWriter>::delete_obj()
- { cvReleaseVideoWriter(&obj); }
- 
- }
diff --git a/testing/opencv/v4l-mmap.patch b/testing/opencv/v4l-mmap.patch
deleted file mode 100644
index b7bbc9b74..000000000
--- a/testing/opencv/v4l-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.ros.org/trac/opencv/ticket/141
-http://bugs.gentoo.org/313649
-
---- src/highgui/cvcap_libv4l.cpp
-+++ src/highgui/cvcap_libv4l.cpp
-@@ -782,7 +782,7 @@
- 
-        capture->buffers[n_buffers].length = buf.length;
-        capture->buffers[n_buffers].start =
--         mmap (NULL /* start anywhere */,
-+         v4l2_mmap (NULL /* start anywhere */,
-                buf.length,
-                PROT_READ | PROT_WRITE /* required */,
-                MAP_SHARED /* recommended */,
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index 68fb3d417..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=5.8p2
-pkgrel=1
-pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
-license=('custom:BSD')
-url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'libedit')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '660092c57bde28bed82078f74011f95fc51c2293'
-          '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
-		--sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \
-		--with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \
-		--with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \
-		--with-libedit=/usr/lib --disable-strip # stripping is done by makepkg
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
-	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
-	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
-	# additional contrib scripts that we like
-	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-	# PAM is a common, standard feature to have
-	sed -i	-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-		-e '/^#UsePAM no$/c UsePAM yes' \
-		"$pkgdir"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index 2ee1091f0..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/var/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-  PID=
-  rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Secure Shell Daemon"
-    [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
-    [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
-    [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
-    [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; }
-    [ -d /var/empty ] || mkdir -p /var/empty
-    [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sshd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Secure Shell Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sshd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index ae028ceb5..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-#auth		required	pam_securetty.so	#Disable remote root
-auth		required	pam_unix.so
-auth		required	pam_env.so
-account		required	pam_nologin.so
-account		required	pam_unix.so
-account		required	pam_time.so
-password	required	pam_unix.so
-session		required	pam_unix_session.so
-session		required	pam_limits.so
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
deleted file mode 100644
index 0ee60d462..000000000
--- a/testing/pciutils/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 115045 2011-03-16 15:19:12Z jgc $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pciutils
-pkgver=3.1.7
-pkgrel=4
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/pciutils.html"
-optdepends=('sh: required by update-pciids')
-makedepends=('wget')
-depends=('glibc')
-source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('35222edb86b50a6641352c66fe829b2e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./update-pciids.sh
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-  cp lib/libpci.a "${srcdir}/"
-  make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
-  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
-}
diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD
deleted file mode 100644
index b13f84bc4..000000000
--- a/testing/php-apc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=php-apc
-pkgver=3.1.8
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
-url='http://pecl.php.net/package/APC'
-depends=('php')
-license="PHP"
-source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
-backup=('etc/php/conf.d/apc.ini')
-md5sums=('bb1147933a61aa70ceffe53cc6f2920f')
-
-build() {
-	cd $srcdir/APC-$pkgver
-	phpize
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd $srcdir/APC-$pkgver
-	make INSTALL_ROOT=$pkgdir install
-	echo ';extension=apc.so' > apc.ini
-	install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini
-	install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php
-	install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt
-}
diff --git a/testing/python2-cairo/PKGBUILD b/testing/python2-cairo/PKGBUILD
deleted file mode 100644
index 0f2fb1462..000000000
--- a/testing/python2-cairo/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python2-cairo
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="Python2 bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL' 'MPL')
-depends=('python2' 'cairo')
-options=('!libtool')
-provides=("pycairo=${pkgver}")
-conflicts=('pycairo')
-replaces=('pycairo')
-source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
-md5sums=('20337132c4ab06c1146ad384d55372c5')
-
-build() {
-  cd "${srcdir}/py2cairo-${pkgver}"
-  sed -i 's:bin/env python:bin/env python2:' waf
-  python2 ./waf --version
-  pushd .waf-*
-  popd
-  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr
-  PYTHON=/usr/bin/python2 ./waf build
-}
-
-package() {
-  cd "${srcdir}/py2cairo-${pkgver}"
-  PYTHON=/usr/bin/python2 ./waf install --destdir="${pkgdir}"
-}
diff --git a/testing/rp-pppoe/PKGBUILD b/testing/rp-pppoe/PKGBUILD
deleted file mode 100644
index 3a23870da..000000000
--- a/testing/rp-pppoe/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: orelien <aurelien.foret@wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=6
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
-arch=('i686' 'x86_64')
-url="http://www.roaringpenguin.com/pppoe/"
-license=('GPL')
-depends=('ppp>=2.4.5' 'sh')
-options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
-  
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-  
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
-}
diff --git a/testing/rp-pppoe/adsl b/testing/rp-pppoe/adsl
deleted file mode 100755
index 33bd91839..000000000
--- a/testing/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/rp-pppoe/rp-pppoe.install b/testing/rp-pppoe/rp-pppoe.install
deleted file mode 100644
index 1d4bccce2..000000000
--- a/testing/rp-pppoe/rp-pppoe.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#arg 1:  the new package version
-post_install() {
-echo ">>> The kernel-mode plugin has a new place."
-echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
-echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
deleted file mode 100644
index c0bbfb4ac..000000000
--- a/testing/run-parts/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 120288 2011-04-22 06:59:00Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=run-parts
-pkgver=3.4.4
-pkgrel=1
-pkgdesc='run scripts or programs in a directory'
-arch=('i686' 'x86_64')
-url='http://packages.qa.debian.org/d/debianutils.html'
-license=('GPL')
-depends=('glibc')
-source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz")
-sha256sums=('f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe')
-
-build() {
-	cd $srcdir/debianutils-$pkgver
-	./configure --prefix=/usr
-	make run-parts
-}
-
-package() {
-	cd $srcdir/debianutils-$pkgver
-	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
-	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
-}
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
deleted file mode 100644
index add4a025c..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 120368 2011-04-22 22:01:28Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_ver=1.8.1p1
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz
-        sudo.pam)
-options=('!libtool' '!makeflags')
-md5sums=('318337804d976c9419cf3004b707945c'
-         '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
-
-build() {
-  cd $srcdir/$pkgname-$_ver
-
-  ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
-    --with-env-editor --with-all-insults --with-logfac=auth
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$_ver
-  install -dm755 $pkgdir/var/lib
-
-  make DESTDIR=$pkgdir install
-  install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo
-
-  install -Dm644 doc/LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE
-}
diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam
deleted file mode 100644
index 4e586cd22..000000000
--- a/testing/sudo/sudo.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
diff --git a/testing/texlive-bin/09-texlive-fonts.conf b/testing/texlive-bin/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/testing/texlive-bin/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <dir>/usr/share/texmf-dist/fonts/opentype</dir>
-  <dir>/usr/share/texmf-dist/fonts/truetype</dir>
-  <dir>/usr/local/share/texmf/fonts/opentype</dir>
-  <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/testing/texlive-bin/PKGBUILD b/testing/texlive-bin/PKGBUILD
deleted file mode 100644
index 980aac315..000000000
--- a/testing/texlive-bin/PKGBUILD
+++ /dev/null
@@ -1,348 +0,0 @@
-# Maintainer: francois <francois.archlinux.org>
-
-pkgname=texlive-bin
-pkgver=2010.1
-_luatex_ver=0.66.0
-pkgrel=8
-pkgdesc="TeX Live binaries"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall')
-optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('pdfjam')
-options=('!libtool')
-url='http://tug.org/texlive/'
-source=('texmf.cnf'
-        'fix-fontforge-encoding.patch'
-        '09-texlive-fonts.conf'
-        'dvipng-fix-options.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20100926.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20101105.tar.xz'
-        #"http://foundry.supelec.fr/gf/download/frsrelease/387/1715/luatex-beta-${_luatex_ver}-source.tar.bz2"
-        "ftp://ftp.archlinux.org/other/texlive/luatex-svn4193.tar.xz"
-)
-backup=(etc/texmf/web2c/texmf.cnf \
-  etc/texmf/chktex/chktexrc \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/web2c/updmap.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
-	etc/texmf/tex/generic/config/language.dat \
-	etc/texmf/tex/generic/config/language.def \
-	etc/texmf/tex/generic/config/pdftexconfig.tex \
-	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvipdfm/config/config \
-	etc/texmf/xdvi/XDvi)
-
-md5sums=('626f900fb59f036d6fea95f08c74b00b'
-         'bfb9716aa00c86c08cd31e5b32edeb98'
-         '393a4bf67adc7ca5df2b386759d1a637'
-         '60e405158f53519348d9783e8d420670'
-         '0b2c3a4a1b1e4befb90d7fbb5f08a6e9'
-         '7ae1400dafdb079dcd08d233de83ec44'
-         '523802a23bc174374403415d9cc87946')
-
-build() {
-   if [ "${CARCH}" = "x86_64" ]; then
-     export CFLAGS="${CFLAGS} -fPIC"
-     export CXXFLAGS="${CXXFLAGS} -fPIC"
-   fi
-
-   cd $srcdir
-   # Building LuaTeX
-   #cd luatex-beta-${_luatex_ver}
-   cd luatex
-   patch -p0 -i ../fix-fontforge-encoding.patch
-   mkdir build
-   cd build
-   ../source/configure --prefix=/usr -C \
-     --disable-native-texlive-build \
-     --with-banner-add="/Arch Linux" \
-    --enable-cxx-runtime-hack \
-    --disable-all-pkgs \
-    --disable-dump-share \
-    --disable-ptex \
-    --enable-luatex  \
-    --without-system-ptexenc \
-    --with-system-graphite \
-    --without-system-icu \
-    --without-system-kpathsea \
-    --with-system-freetype2 \
-    --with-system-poppler \
-    --with-freetype2-libdir=/usr/lib \
-    --with-freetype2-include=/usr/include/freetype2 \
-    --with-system-gd \
-    --with-system-libpng \
-    --without-system-teckit \
-    --with-system-zlib \
-    --with-system-zziplib \
-    --with-system-t1lib \
-    --disable-shared \
-    --disable-largefile \
-    --disable-ipc \
-    --without-mf-x-toolkit \
-    --without-x
-   make
-   make -C libs/obsdcompat
-   make -C texk/kpathsea
-   make -C texk/web2c luatex
-
-   cd "$srcdir"
-   # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -p0 -i fix-fontforge-encoding.patch
-   ## fix dvipng (bug #20157)
-   pushd "source/texk/dvipng/dvipng-1.13"
-   patch -p0 -i "$srcdir/dvipng-fix-options.patch"
-   popd
-
-   #############################################################
-   ### configure
-   cd source
-   ## prevent compiling Xdvi with libXp
-   sed -i~ 's|-lXp ||' texk/xdvik/configure
-   test ! -d Work && mkdir Work
-   cd Work
-   echo "--> Initial configuration..."
-   # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree
-   ../configure --prefix=/usr -C \
-     --datarootdir=$srcdir/inst/usr/share \
-     --datadir=$srcdir/inst/usr/share \
-     --mandir=$srcdir/inst/usr/share/man \
-     --disable-native-texlive-build \
-     --with-banner-add="/Arch Linux" \
-     --disable-multiplatform \
-     --disable-dialog \
-     --disable-psutils \
-     --disable-t1utils \
-     --disable-bibtexu \
-     --disable-xz \
-     --with-system-zlib \
-     --with-system-pnglib \
-     --with-system-ncurses \
-     --with-system-t1lib \
-     --with-system-gd \
-     --with-system-xpdf \
-     --with-system-freetype2 \
-     --with-system-graphite \
-     --with-freetype2-libdir=/usr/lib \
-     --with-freetype2-include=/usr/include/freetype2 \
-     --with-xdvi-x-toolkit=xaw \
-     --disable-dump-share \
-     --disable-aleph \
-     --disable-luatex \
-     --with-clisp-runtime=default \
-     --enable-xindy --disable-xindy-rules --disable-xindy-docs
-   #############################################################
-   ### make
-   echo "-------------------------------------------------------"
-   echo "--> Building the whole beast ..."
-   echo "-------------------------------------------------------"
-   make
-}
-
-package() {
-   cd $srcdir
-   #############################################################
-   ### install texmf tree
-   echo "-------------------------------------------------------"
-   echo "--> installing the texmf tree"
-   echo "-------------------------------------------------------"
-   install -m755 -d $pkgdir/usr/share
-   cp -r texmf $pkgdir/usr/share/
-   install -d -m755 $pkgdir/etc/texmf/web2c
-   install -d -m755 $pkgdir/etc/texmf/chktex
-   install -d -m755 $pkgdir/etc/texmf/dvips/config
-   install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
-   install -d -m755 $pkgdir/etc/texmf/dvipdfmx
-   install -d -m755 $pkgdir/etc/texmf/tex/generic/config
-   install -d -m755 $pkgdir/etc/texmf/ttf2pk
-   install -d -m755 $pkgdir/etc/texmf/xdvi
-   install -d -m755 $pkgdir/etc/fonts/conf.avail
-   install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
-   # replace upstream texmf.cnf with ours
-   rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
-   install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
-   # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
-   # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
-   ln -s /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
-   # fix location of TEXMFCACHE for luatools
-   sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
-   # move man files to /usr/share/man
-   for i in 1 5; do
-     install -d -m755 $pkgdir/usr/share/man/man$i
-     mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
-   done
-   # move info files to /usr/share/info
-   install -d -m755 $pkgdir/usr/share/info
-   mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
-   rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
-   # copy config files to $TEXMFCONFIG tree
-   cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
-     	$pkgdir/etc/texmf/chktex/
-   cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
-   	  $pkgdir/etc/texmf/web2c/
-   cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
-   	  $pkgdir/etc/texmf/web2c/
-   cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
-   	  $pkgdir/etc/texmf/web2c/
-   cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
-   	  $pkgdir/etc/texmf/dvips/config/
-   cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
-   	  $pkgdir/etc/texmf/dvipdfm/config/
-   cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
-   	  $pkgdir/etc/texmf/dvipdfmx/
-   cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
-   	  $pkgdir/etc/texmf/tex/generic/config/
-   cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
-   	  $pkgdir/etc/texmf/tex/generic/config/
-   cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
-   	  $pkgdir/etc/texmf/tex/generic/config/
-   cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
-   	  $pkgdir/etc/texmf/ttf2pk/
-   cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
-   	  $pkgdir/etc/texmf/xdvi/
-   # remove TL specific warnings in the language.{dat,def} files:
-   sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.*
-   # clean updmap.cfg
-   sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
-   sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
-
-   #############################################################
-   ### install
-   cd source
-   # fixes for xindy
-   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-
-   echo "-------------------------------------------------------"
-   echo "--> Proceeding with make install ..."
-   echo "-------------------------------------------------------"
-   cd Work
-   make prefix=$srcdir/inst/usr texmf=$pkgdir/usr/share/texmf install
-
-   # restore install location of bin/lib/include
-   mv -f $srcdir/inst/usr/bin $pkgdir/usr/bin
-   mv -f $srcdir/inst/usr/lib $pkgdir/usr/lib
-   mv -f $srcdir/inst/usr/include $pkgdir/usr/include
-   # add symlinks to manpages since they are not included in the original texmf tree
-   for m in $srcdir/inst/usr/share/man/man1/*; do
-     bm=$(basename $m)
-     test -f $pkgdir/usr/share/man/man1/$bm || mv -f $m $pkgdir/usr/share/man/man1/
-   done
-
-   ## install luatex binary
-   #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
-   install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/
-   cd $pkgdir/usr/bin
-   /bin/ln -s luatex texlua
-   /bin/ln -s luatex texluac
-
-   # symlinks in $pkgdir/usr/bin are incorrect
-   echo "--> Fixing symlinks for scripts ..."
-   for f in $pkgdir/usr/bin/* ; do
-	   if [ -L $f ]; then
-		   target=`ls -l "$f" | sed 's/^.\+ -> //'`
-		   if [[ "$target" == ..* ]]; then
-			   newtarget=`echo $target | sed -e 's#../#/usr/share/#'`
-			   rm -f $f
-			   ln -s $newtarget $f
-			   test -f $pkgdir/$newtarget && chmod a+x $pkgdir/$newtarget
-		   fi
-	   fi
-   done
-
-   # create symlinks for formats 
-   echo "--> Create symlinks for TeX formats ..."
-   PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
-   #############################################################
-   # remove dangling symlinks
-   _bibtexextra_scripts="bibexport"
-   _core_scripts="
-afm2afm
-arlatex
-autoinst
-bundledoc
-cmap2enc
-de-macro
-dviasm
-epstopdf
-findhyph
-font2afm
-fragmaster
-installfont-tl
-latex2man
-latexdiff
-latexdiff-vc
-latexmk
-latexrevise
-listings-ext.sh
-mkjobtexmf
-mkluatexfontdb
-mkt1font
-mptopdf
-ot2kpx
-pdf180
-pdf270
-pdf90
-pdfatfi
-pdfbook
-pdfcrop
-pdfflip
-pdfjam
-pdfjam-pocketmod
-pdfjam-slides3up
-pdfjam-slides6up
-pdfjoin
-pdfnup
-pdfpun
-pfm2kpx
-pkfix
-pkfix-helper
-purifyeps
-repstopdf
-rpdfcrop
-showglyphs
-texcount
-texdiff
-texdirflatten
-texloganalyser
-thumbpdf
-vpl2ovp
-vpl2vpl
-"
-   _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
-   _langextra_scripts="ebong"
-   _langgreek_scripts="mkgrkindex"
-   _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
-vpe"
-   _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
-   _pstricks_scripts="pst2pdf"
-   _science_scripts="ulqda"
-   for s in \
-        ${_bibtexextra_scripts} \
-        ${_core_scripts} \
-        ${_htmlxml_scripts}    \
-        ${_langextra_scripts}  \
-        ${_langgreek_scripts}  \
-        ${_latexextra_scripts} \
-        ${_pictures_scripts}   \
-        ${_pstricks_scripts}   \
-        ${_science_scripts}    \
-        tlmgr; do
-     rm -f $pkgdir/usr/bin/$s
-   done
-   ###################################################################
-}
-
diff --git a/testing/texlive-bin/dvipng-fix-options.patch b/testing/texlive-bin/dvipng-fix-options.patch
deleted file mode 100644
index c0eda1d90..000000000
--- a/testing/texlive-bin/dvipng-fix-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- papersiz.c	2010/03/17 21:40:00	1.16
-+++ papersiz.c	2010/09/29 21:14:40	1.17
-@@ -52,6 +52,7 @@
-   while (*q != ',' && *q !='\0')
-     q++;
-   tmp = tmp*lengthsp[i]*dpi/4736286L; /*   sp * dots/in / (sp/in), convert sp to pixels   */
-+  *p=q;
-   return((int32_t) tmp);
- }
- 
diff --git a/testing/texlive-bin/fix-fontforge-encoding.patch b/testing/texlive-bin/fix-fontforge-encoding.patch
deleted file mode 100644
index 8104b3289..000000000
--- a/testing/texlive-bin/fix-fontforge-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig	2009-09-30 19:27:00.935039526 +0200
-+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c	2009-09-30 19:28:04.908364646 +0200
-@@ -495,6 +495,9 @@
- 	{ "Big5HKSCS", e_big5hkscs },
- 	{ "Big5-HKSCS", e_big5hkscs },
- 	{ "UTF-8", e_utf8 },
-+	{ "utf-8", e_utf8 },
-+	{ "UTF8", e_utf8 },
-+	{ "utf8", e_utf8 },
- 	{ "ISO-10646/UTF-8", e_utf8 },
- 	{ "ISO_10646/UTF-8", e_utf8 },
- 	{ "UCS2", e_unicode },
diff --git a/testing/texlive-bin/texmf.cnf b/testing/texlive-bin/texmf.cnf
deleted file mode 100644
index b9d51682a..000000000
--- a/testing/texlive-bin/texmf.cnf
+++ /dev/null
@@ -1,663 +0,0 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
-% Public domain.
-% 
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM.  This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-%   expanded into the compile-time default. Probably not what you want.
-%
-
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  You can use the path
-% separator as well as the comma for this: /usr/local/{mytex:othertex}
-% also expands to /usr/local/mytex:/usr/local/othertex.  We make
-% extensive use of this.
-
-%  Part 1: Search paths and directories.
-
-% You can set an environment variable to override TEXMF if you're testing
-% a new TeX tree, without changing anything else.
-%
-% You may wish to use one of the $SELFAUTO... variables here so TeX will
-% find where to look dynamically.  See the manual and the definition
-% below of TEXMFCNF.
-
-% The tree containing the runtime files closely related to the specific
-% program version used:
-TEXMFMAIN = /usr/share/texmf
-
-% The main distribution tree:
-TEXMFDIST = /usr/share/texmf-dist
-
-% Our documentation-only tree, arranged by language:
-TEXMFDOC = /usr/share/texmf-doc
-
-% A place for local additions to a "standard" texmf tree.
-% This tree is not used for local configuration maintained by
-% texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = /usr/local/share/texmf
-
-% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% User texmf trees are allowed as follows.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig stores variable runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig stores configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% Now, list all the texmf trees. If you have multiple trees you can
-% use shell brace notation, like this:
-%   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-% The braces are necessary.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-% 
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
-% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as format files.  Overriding them would be more
-% likely to cause trouble than help.  On the other hand, all the
-% standard packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those (although it is generally a
-% source of confusion to have different versions of a package installed,
-% whatever the trees, so try to avoid it).
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files.  There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees.  These are the trees that are shared by all the users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-
-% Where generated fonts may be written.  This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats.  For example
-%   TEXMFVAR = /var/lib/texmf
-% is used in many distros.  In this case, set VARTEXFONTS like this
-% VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files.  The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.  We specify paths for all known
-% formats, past or present.  Not all of them are built these days.
-
-% Plain TeX.  Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/.  In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo    = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-
-% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
-
-% jadetex
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/.  But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi.  Must come before the generic settings.
-PKFONTS.XDvi   = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi   = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh.  If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched.  See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files.  This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs.  Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files.  bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX).  An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR//
-
-% Opentype outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS =  .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~.  These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for fontconfig library, used by Windows versions of
-% xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores this.
-FONTCONFIG_FILE=fonts.conf
-FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs.  If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS   = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% Find scripts that are distributed/installed in the texmf tree.
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-% 
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one under texmf/web2c.
-% 
-% For security reasons, it is better not to include . in this path.
-%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-%  Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first.  If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried.  The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension.  A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases.  E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}.  When enabled fully (set to
-% t), obviously insecure.  When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed.  Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-% 
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
-% 
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-%   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid)   : as `r' and disallow going to parent directories, and
-%                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-% TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT.  Set to the
-% empty string or  0  to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible.  The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default?  These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option.  Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-% MKTEXTEX = 0
-% MKTEXPK = 0
-% MKTEXMF = 0
-% MKTEXTFM = 0
-% MKTEXFMT = 0
-% MKOCP = 0
-% MKOFM = 0
-
-% Used by makempx to run TeX.  We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option.  %d is replaced by the line number and %s by
-% the current filename.  The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d "%s"
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-%  Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*.  (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0     % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 200000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences.  These values apply to TeX.
-pool_size = 3250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size.  TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line.  As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much.  The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
-                        % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions, 
-                        % also applies to MetaPost
-param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size = 50000       % for saving values outside current group
-stack_size = 5000       % simultaneous input sources
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much.  Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384  % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line      < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size =  250
-glob_str_size = 5000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
deleted file mode 100644
index 31c83a9e9..000000000
--- a/testing/usbutils/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
-pkgname=usbutils
-pkgver=002
-pkgrel=2
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-groups=('base')
-makedepends=('wget')
-depends=('glibc' 'libusb')
-optdepends=('python2: for lsusb.py usage'
-           'coreutils: for lsusb.py usage')
-url="http://linux-usb.sourceforge.net/"
-source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
-        fix-python2.patch)
-md5sums=('05610d15c3c8c8ada3d691c320ca784a'
-         '45766196895b4cc50b53cd56e1bbf3d1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  rm usb.ids
-  wget http://www.linux-usb.org/usb.ids
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i ../fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # fix pkgconfig file
-  mkdir -p $pkgdir/usr/lib
-  mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/
-}
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-05-05 16:07:43 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-05-05 16:07:43 -0300
commit	3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch)
tree	175c9e1755980b2a955b1b9e6b93c1a3d431276f
parent	933e5d274b2a4e386565d2f3bb982682e168438b (diff)
parent	2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff)