Mon May 2 22:32:52 UTC 2011

36 files changed, 1061 insertions, 76 deletions

diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD
new file mode 100644
index 000000000..4bda28ff2
--- /dev/null
+++ b/community-testing/calibre/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 46006 2011-05-01 19:38:47Z schuay $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Petrov Roman <nwhisper@gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+
+pkgname=calibre
+pkgver=0.7.59
+pkgrel=2
+pkgdesc="Ebook management application"
+arch=('i686' 'x86_64') 
+url="http://calibre.kovidgoyal.net/"
+license=('GPL3')
+depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' 
+         'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
+         'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 
+         'python-imaging' 'desktop-file-utils' 'shared-mime-info' 
+         'python-dnspython' 'unrar' 'python2-qt' 'icu')
+makedepends=('python2-pycountry')
+optdepends=('ipython: to use calibre-debug')
+install=calibre.install
+source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+        desktop_integration.patch)
+md5sums=('78ebed5248758b9be1d135ae018b8dfe'
+         'bcc538a3b004429bf8f5a0ac1d89a37f')
+
+build() {
+  cd "${pkgname}"
+
+  rm -rf src/{cherrypy,pyPdf}
+  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
+  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
+    $(find . -regex ".*.py\|.*.recipe")
+
+  python2 setup.py build || return 1
+  python2 setup.py resources || return 1
+  python2 setup.py translations || return 1
+}
+
+package() {
+  cd ${pkgname}
+  
+  patch -Np1 -i $srcdir/desktop_integration.patch || return 1
+
+  # More on desktop integration (e.g. enforce arch defaults)
+  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
+      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
+      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
+      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
+
+  # Fix the environment module location
+  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
+
+  mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages
+  python2 setup.py install --root=${pkgdir}/ --prefix=/usr \
+    --staging-bindir=${pkgdir}/usr/bin \
+    --staging-libdir=${pkgdir}/usr/lib \
+    --staging-sharedir=${pkgdir}/usr/share
+
+  find ${pkgdir} -type d -empty -delete
+
+  # Decompress the man pages so makepkg will do it for us.
+  for decom in ${pkgdir}/usr/share/man/man1/*.bz2; do
+    bzip2 -d ${decom}
+  done
+}
diff --git a/community-testing/calibre/calibre.install b/community-testing/calibre/calibre.install
new file mode 100644
index 000000000..6210bd0ab
--- /dev/null
+++ b/community-testing/calibre/calibre.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch
new file mode 100644
index 000000000..fa58443ed
--- /dev/null
+++ b/community-testing/calibre/desktop_integration.patch
@@ -0,0 +1,70 @@
+diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
+--- calibre.orig//src/calibre/linux.py	2010-09-17 22:38:02.000000000 +0200
++++ calibre/src/calibre/linux.py	2010-09-19 15:50:15.029705851 +0200
+@@ -334,52 +323,39 @@ class PostInstall:
+ 
+             with TemporaryDirectory() as tdir:
+                 with CurrentDir(tdir):
+-                    render_img('mimetypes/lrf.png', 'calibre-lrf.png')
+-                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+-                    self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
+-                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+-                    self.icon_resources.append(('mimetypes', 'application-lrs',
+-                    '128'))
+-                    render_img('lt.png', 'calibre-gui.png')
+-                    check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
+-                    self.icon_resources.append(('apps', 'calibre-gui', '128'))
+-                    render_img('viewer.png', 'calibre-viewer.png')
+-                    check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+-                    self.icon_resources.append(('apps', 'calibre-viewer', '128'))
++                    dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
++                    os.mkdir(dir)
++                    render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
++                    render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
++                    render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
+ 
+                     mimetypes = set([])
+                     for x in all_input_formats():
+                         mt = guess_type('dummy.'+x)[0]
+-                        if mt and 'chemical' not in mt:
++                        if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
+                             mimetypes.add(mt)
+ 
+                     def write_mimetypes(f):
+                         f.write('MimeType=%s;\n'%';'.join(mimetypes))
+ 
+-                    f = open('calibre-lrfviewer.desktop', 'wb')
++                    dir = os.path.join(self.opts.staging_sharedir,'../applications')
++                    os.mkdir(dir)
++                    f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+                     f.write(VIEWER)
+                     f.close()
+-                    f = open('calibre-ebook-viewer.desktop', 'wb')
++                    f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
+                     f.write(EVIEWER)
+                     write_mimetypes(f)
+                     f.close()
+-                    f = open('calibre-gui.desktop', 'wb')
++                    f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
+                     f.write(GUI)
+                     write_mimetypes(f)
+                     f.close()
+-                    des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
+-                            'calibre-ebook-viewer.desktop')
+-                    for x in des:
+-                        cmd = ['xdg-desktop-menu', 'install', './'+x]
+-                        if x != des[-1]:
+-                            cmd.insert(2, '--noupdate')
+-                        check_call(' '.join(cmd), shell=True)
+-                        self.menu_resources.append(x)
+-                    f = open('calibre-mimetypes', 'wb')
++                    dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
++                    os.makedirs(dir)
++                    f = open(os.path.join(dir, 'calibre.xml'), 'wb')
+                     f.write(MIME)
+                     f.close()
+-                    self.mime_resources.append('calibre-mimetypes')
+-                    check_call('xdg-mime install ./calibre-mimetypes', shell=True)
+         except Exception:
+             if self.opts.fatal_errors:
+                 raise
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index 96bb1cbc2..ce6815552 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.04
-pkgrel=4
+pkgver=11.05
+pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('gtk2' 'gimp-ufraw' 'perl-exiftool' 'xdg-utils')
+depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils')
 optdepends=('mashup: for printing from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('4b90ca45375d7502a98f6ce556a1d9b7')
+md5sums=('8c970b43716ddcf6ee7d5cd15ca37d44')
 replaces=('fotox')
 
 build() {
@@ -17,13 +17,14 @@ build() {
   make PREFIX=/usr \
     CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \
     LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" 
-  sed -i 's#/local##' desktop
-  sed -i 's+^# ++' desktop
+  sed -i '8,9d' data/desktop
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -Dm644 desktop \
+  install -Dm644 data/desktop \
     $pkgdir/usr/share/applications/$pkgname.desktop 
-  make DESTDIR=$pkgdir PREFIX=/usr install
+  make MENUFILE1=$pkgdir/usr/share/applications/$pkgname.desktop \
+    DESTDIR=$pkgdir PREFIX=/usr install
+rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop 
 }
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 096d33f6a..003198220 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ifuse
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 5d7439740..47eebefc0 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 40353 2011-02-23 08:02:01Z ebelanger $
+# $Id: PKGBUILD 45984 2011-05-01 11:42:17Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
-pkgver=2.0.1
-pkgrel=3
+pkgver=2.0.2
+pkgrel=1
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('dcraw' 'exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libtiff' 'openexr' 'qt')
+depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt')
 replaces=('qtpfsgui')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-v${pkgver}.tar.gz)
-md5sums=('3d94bb4c40c7cbff2ebe8f3c15b46596')
-sha1sums=('4777912d8f70b02ff2586ea8c31a196ee265c81e')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
+sha256sums=('8a13aff0041fd7f7542af0b6b11e412c01f022d509458c4a701f8ca84bade993')
 
 build() {
-  cd "${srcdir}/luminance-v${pkgver}"
+  cd ${srcdir}/LuminanceHDR-${pkgver}
 
   if [ ${CARCH} = i686 ]; then
     sed -i 's/ -msse2//' project.pro
@@ -31,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/luminance-v${pkgver}"
+  cd ${srcdir}/LuminanceHDR-${pkgver}
 
-  make INSTALL_ROOT="${pkgdir}" install
+  make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index fe01ee552..bf0fe1e4c 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,6 +1,5 @@
-2010-XX-XX Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.2
-	* dcraw dependency added for RAW support
+2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.0.2-1
 
 2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* exiv2 0.20 rebuild
diff --git a/community/luminancehdr/luminancehdr.install b/community/luminancehdr/luminancehdr.install
index 1e4c274b3..279762804 100644
--- a/community/luminancehdr/luminancehdr.install
+++ b/community/luminancehdr/luminancehdr.install
@@ -1,5 +1,6 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD
index 9df6caae8..2c941c653 100644
--- a/community/warsow/PKGBUILD
+++ b/community/warsow/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45971 2011-04-30 23:33:26Z svenstaro $
+# $Id: PKGBUILD 45996 2011-05-01 17:37:53Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: Babets
@@ -6,7 +6,7 @@
 
 pkgname=warsow
 pkgver=0.62
-pkgrel=1
+pkgrel=2
 pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine"
 url="http://www.warsow.net/"
 license=('GPL')
@@ -24,8 +24,8 @@ md5sums=('f9bf60c80820237f7097c4e50a9582cd'
          '649568447e938efded07e77cdfb3accb')
 
 build() {
-  #unset CFLAGS
-	#unset CXXFLAGS
+  unset CFLAGS
+	unset CXXFLAGS
 
   # Extract Game Source Code
   unzip -o warsow_${pkgver}_sdk.zip -d $srcdir/warsow-src
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 28724f9eb..b485b65db 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110785 2011-02-22 08:10:56Z heftig $
+# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
 pkgver=1.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
@@ -30,4 +30,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
 }
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 5139ab408..217a1a3e1 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119825 2011-04-15 13:37:39Z ibiru $
+# $Id: PKGBUILD 121987 2011-05-01 07:40:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
          't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
 optdepends=('texlive-bin: DVI support')
diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD
index c9d6b8bbd..6e1179620 100644
--- a/extra/file-roller/PKGBUILD
+++ b/extra/file-roller/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120737 2011-04-26 09:07:12Z heftig $
+# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=file-roller
 pkgver=3.0.1
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME2"
+pkgrel=2
+pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
 optdepends=('nautilus: nautilus shell extension'
             'unrar: the RAR uncompression program'
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 6e45943c9..907a0de90 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118020 2011-04-05 06:52:04Z heftig $
+# $Id: PKGBUILD 122004 2011-05-01 11:09:24Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -7,7 +7,7 @@
 
 pkgname=network-manager-applet
 pkgver=0.8.998
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,16 +15,17 @@ url="http://www.gnome.org/projects/NetworkManager/"
 depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3'
          'notification-daemon' 'libnotify' 'gnome-icon-theme'
          'mobile-broadband-provider-info' 'gconf')
-makedepends=('intltool' 'gnome-bluetooth')
+makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool')
 install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0a16e2ae00312062d4cd140d811227b84ac69e7d9487f6a84810f3d461894a82')
+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')
 
 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 30d109d2c..67e45c167 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 98215 2010-11-04 21:22:18Z ibiru $
+# $Id: PKGBUILD 122013 2011-05-01 11:25:47Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.8.2
+pkgver=0.8.998
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect>=2.26' 'dbus-glib')
-makedepends=('intltool' 'gtk2' 'libglade' 'gconf' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf' 'libgnome-keyring')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
-sha256sums=('6ef8ff1a14e112baf7d90cc1c19163c7895b56b60629641086540bacb8babb4f')
+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')
 
 build() {
   cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
+  ./autogen.sh
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index a5991fa4c..04036a2e9 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119010 2011-04-10 13:15:03Z ibiru $
+# $Id: PKGBUILD 122001 2011-05-01 11:08:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,13 +7,13 @@
 
 pkgname=networkmanager
 pkgver=0.8.998
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -22,9 +22,10 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
+#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
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82'
+sha256sums=('f9362e5db1f700df927c5ce5a4089e67270a0ce8ca9ab1c5384ae93d2d8ec0e2'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
 
@@ -33,6 +34,7 @@ build() {
 
   patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
 
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 14d294341..6798e75d6 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 118392 2011-04-06 14:48:01Z ibiru $
+# $Id: PKGBUILD 121998 2011-05-01 11:06:29Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=2.26
+pkgver=3.02
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl')
-makedepends=('gconf' 'gtk2')
+depends=('libxml2' 'openssl' 'libproxy')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e3c7605fed128efe39c2eb9400af6765')
+md5sums=('c12688474f432a6d590958cc1c1ff076')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,6 +23,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" LIBDIR=/usr/lib install-lib
 
   install  -Dm0644 openconnect.8 "${pkgdir}"/usr/share/man/man8/openconnect.8
 }
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index c8828ee20..16f568c46 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121225 2011-04-29 15:13:05Z bisson $
+# $Id: PKGBUILD 122020 2011-05-01 17:05:22Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -18,6 +18,7 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'pam.d'
         'logrotate'
         'gcc44.patch'
+	'ptr_pam.patch'
         'no-host.patch'
         'restart.patch'
         'sigterm.patch'
@@ -27,6 +28,7 @@ sha1sums=('e421d5487732c8317f8f591906661e014b036358'
           'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
           'b969cc902c1d9915a5609141a652c77b2732407b'
           '51121d451116c768d0fc027ff1ea70aaaef036e7'
+          '640668c984a13593a1bfba8d3b503c005d5f401e'
           'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
           '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
           '0b35048723c527fb824c5e0f9b9064f751871785'
@@ -38,11 +40,12 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i -e 's/png12/png14/g' Makefile
-	patch -p1 -i ../gcc44.patch
-	patch -p1 -i ../no-host.patch # do not set PAM host
-	patch -p1 -i ../restart.patch # restart X server if killed
-	patch -p1 -i ../sigterm.patch # do not wait for user input when SIGTERM'd
-	patch -p1 -i ../tty-slowness.patch # fix sluggish TTY after slim start
+	patch -p1 -i ../gcc44.patch   # FS#14815: lacks include for gcc-4.4
+	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
+	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
+	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
+	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
+	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
 
 	make USE_PAM=1
 }
diff --git a/extra/slim/ptr_pam.patch b/extra/slim/ptr_pam.patch
new file mode 100644
index 000000000..3a3fbcdb7
--- /dev/null
+++ b/extra/slim/ptr_pam.patch
@@ -0,0 +1,52 @@
+diff -aur old/app.cpp new/app.cpp
+--- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
++++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
+@@ -43,8 +43,8 @@
+     Panel* panel = *static_cast<Panel**>(appdata_ptr);
+     int result = PAM_SUCCESS;
+     for (int i=0; i<num_msg; i++){
+-        resp[i]->resp=0;
+-        resp[i]->resp_retcode=0;
++        (*resp)[i].resp=0;
++        (*resp)[i].resp_retcode=0;
+         switch(msg[i]->msg_style){
+             case PAM_PROMPT_ECHO_ON:
+                 // We assume PAM is asking for the username
+@@ -53,13 +53,13 @@
+                     case Panel::Suspend:
+                     case Panel::Halt:
+                     case Panel::Reboot:
+-                        resp[i]->resp=strdup("root");
++                        (*resp)[i].resp=strdup("root");
+                         break;
+ 
+                     case Panel::Console:
+                     case Panel::Exit:
+                     case Panel::Login:
+-                        resp[i]->resp=strdup(panel->GetName().c_str());
++                        (*resp)[i].resp=strdup(panel->GetName().c_str());
+                         break;
+                 }
+                 break;
+@@ -75,7 +75,7 @@
+ 
+                     default:
+                         panel->EventHandler(Panel::Get_Passwd);
+-                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
++                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
+                         break;
+                 }
+                 break;
+@@ -91,9 +91,9 @@
+     }
+     if (result!=PAM_SUCCESS){
+         for (int i=0; i<num_msg; i++){
+-            if (resp[i]->resp==0) continue;
+-            free(resp[i]->resp);
+-            resp[i]->resp=0;
++            if ((*resp)[i].resp==0) continue;
++            free((*resp)[i].resp);
++            (*resp)[i].resp=0;
+         };
+         free(*resp);
+         *resp=0;
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 3afa2b1e1..ba2f50aee 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118432 2011-04-06 20:04:46Z ibiru $
+# $Id: PKGBUILD 121992 2011-05-01 07:56:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributer: Ben <contrasutra@myrealbox.com>
 
@@ -12,11 +12,11 @@ depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins
 makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc')
 options=(!emptydirs)
 #source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110501.tar.xz)
 groups=('gnome-extra')
 install=sound-juicer.install
 url="http://www.burtonini.com/blog/computers/sound-juicer"
-sha256sums=('09fd7ebaa24b20a98be82bc10a9733f2e8d45bb31fb95a12535672d85272d8c2')
+sha256sums=('e4312ebf75c8798dd3f7a9d2d9ee7291b593bd68c7b0559742b91ca7a52674fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
new file mode 100644
index 000000000..eacbfdbb4
--- /dev/null
+++ b/libre/unarchiver/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Cedric Girard <girard.cedric@gmail.com>
+pkgname=unarchiver
+pkgver=2.7
+pkgrel=1
+pkgdesc="An Objective-C application for uncompressing archive files"
+arch=('x86_64' 'i686')
+url="http://wakaba.c3.cx/s/apps/unarchiver.html"
+license=('LGPL')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+makedepends=('gcc-objc')
+source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip)
+md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41')
+replaces=('unrar')
+conflicts=('unrar')
+
+build() {
+  cd "$srcdir/The Unarchiver/XADMaster"
+
+  . /usr/share/GNUstep/Makefiles/GNUstep.sh
+  make -f Makefile.linux
+}
+
+package() {
+  cd "$srcdir/The Unarchiver/XADMaster"
+  install -d "$pkgdir/usr/bin/"
+  cp unar lsar "$pkgdir/usr/bin/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
new file mode 100644
index 000000000..d561a25da
--- /dev/null
+++ b/multilib-testing/binutils-multilib/PKGBUILD
@@ -0,0 +1,75 @@
+# $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
new file mode 100644
index 000000000..8bf9f3a47
--- /dev/null
+++ b/multilib-testing/binutils-multilib/binutils.install
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..4a5a69628
--- /dev/null
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -0,0 +1,305 @@
+# $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
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-ada.install
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-fortran.install
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-go.install
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- 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
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc-libs.install
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc.install
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..8c6b08171
--- /dev/null
+++ b/multilib-testing/gcc-multilib/gcc_pure64.patch
@@ -0,0 +1,24 @@
+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/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 4728160d0..c00439328 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.3.20.2
-_bcver=0.3.20
+pkgver=0.3.21
+_bcver=0.3.21
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency."
 arch=('i686' 'x86_64')
@@ -19,10 +19,6 @@ source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/b
         makefile.archlinux
         bitcoin-daemon.install
         rc.bitcoind)
-md5sums=('f527a2669f4cfe82abf1fe9bea070c64'
-         '8e2ff558c2538e53c177513ad7d8b9a5'
-         'a388684057de2bb543cb7f795dc693cf'
-         '4a9ab4997487bb5f8e3c6b1d580045af')
 
 build() {
 	cd $srcdir/${_pkgname}-${pkgver}/src
@@ -53,3 +49,7 @@ package() {
 	chown -R 8333:8333 $pkgdir/var/lib/$pkgname
 	chmod -R 700 $pkgdir/var/lib/$pkgname
 }
+md5sums=('19e530a9b60e3a0987998a87b30d8cdc'
+         '8e2ff558c2538e53c177513ad7d8b9a5'
+         'a388684057de2bb543cb7f795dc693cf'
+         '4a9ab4997487bb5f8e3c6b1d580045af')
diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD
index 13b1ef8fa..15d70051a 100644
--- a/testing/cronie/PKGBUILD
+++ b/testing/cronie/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='cronie'
 pkgver=1.4.7
-pkgrel=6
+pkgrel=7
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
@@ -27,8 +27,7 @@ backup=('etc/crontab'
         'etc/pam.d/crond'
         'etc/cron.deny')
 
-conflicts=('dcron')
-replaces=('dcron')
+conflicts=('cron')
 provides=('cron')
 groups=('base')
 
diff --git a/testing/dcron/PKGBUILD b/testing/dcron/PKGBUILD
new file mode 100644
index 000000000..76af827e8
--- /dev/null
+++ b/testing/dcron/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Paul Mattal <paul.archlinux.org>
+
+pkgname=dcron
+pkgver=4.5
+pkgrel=1
+pkgdesc="dillon's lightweight cron daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.jimpryor.net/linux/dcron"
+backup=('var/spool/cron/root' 'etc/conf.d/crond')
+depends=('bash')
+provides=('cron')
+conflicts=('cron')
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('078833f3281f96944fc30392b1888326')
+optdepends=('smtp-server: sending cron job output via email')
+install=$pkgname.install
+
+build() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+
+	# by default, any member of group "users" can edit their own crontab
+	make \
+		PREFIX=/usr \
+		CRONTAB_GROUP=users \
+		CRONTABS=/var/spool/cron \
+		CRONSTAMPS=/var/spool/cronstamps
+}
+
+package() {
+	cd "$srcdir/${pkgname}-${pkgver}"
+	make DESTDIR="$pkgdir" install
+
+	# install standard configuration and scripts
+	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
+
+	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
+	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
+	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
+	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
+	install -D -m644 extra/crond.logrotate "$pkgdir/etc/logrotate.d/crond"
+}
diff --git a/testing/dcron/dcron.install b/testing/dcron/dcron.install
new file mode 100644
index 000000000..df23d0224
--- /dev/null
+++ b/testing/dcron/dcron.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+	if [ $(vercmp $2 4.0) -lt 0 ]
+	then
+		echo "Restart crond, since you're upgrading to the dcron 4.x series."
+	fi
+}
diff --git a/testing/libcap/PKGBUILD b/testing/libcap/PKGBUILD
new file mode 100644
index 000000000..2d91dbbf9
--- /dev/null
+++ b/testing/libcap/PKGBUILD
@@ -0,0 +1,26 @@
+#$Id: PKGBUILD 122049 2011-05-02 01:47:02Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=libcap
+pkgver=2.21
+pkgrel=1
+pkgdesc="POSIX 1003.1e capabilities"
+arch=('i686' 'x86_64')
+url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
+license=('GPL')
+depends=('glibc' 'attr')
+source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz)
+md5sums=('61966ef40f2dee8731b69db895e4548d')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install
+  rm ${pkgdir}/lib/*.a
+  chmod 755 ${pkgdir}/lib/libcap.so.${pkgver}
+}
diff --git a/testing/python2-cairo/PKGBUILD b/testing/python2-cairo/PKGBUILD
new file mode 100644
index 000000000..0f2fb1462
--- /dev/null
+++ b/testing/python2-cairo/PKGBUILD
@@ -0,0 +1,32 @@
+# $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}"
+}