Thu Mar 22 00:01:28 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-03-22 00:01:28 +0000
committer: root <root@rshg054.dnsready.net> 2012-03-22 00:01:28 +0000
commit: 39e662ccfbe62ae77d458159d192816171a22f43 (patch)
tree: 2484a55934cd77dd33597ab2f214de5b7326cf69
parent: a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff)
75 files changed, 1855 insertions, 337 deletions
diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD
index ebee489f0..458e721c6 100644
--- a/community/agave/PKGBUILD
+++ b/community/agave/PKGBUILD
@@ -1,45 +1,42 @@
-# $Id: PKGBUILD 66590 2012-02-26 13:20:19Z lfleischer $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 68265 2012-03-20 22:39:06Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=agave
 pkgver=0.4.7
-pkgrel=3
-pkgdesc="An colorscheme designer for the Gnome desktop"
+pkgrel=4
+pkgdesc="Colorscheme designer tool for GNOME"
 arch=('i686' 'x86_64')
-url="http://home.gna.org/colorscheme"
+url="http://home.gna.org/colorscheme/"
 license=('GPL')
-depends=('gtkmm' 'libgnomeui' 'libglademm' 'gconfmm>=2.18.1' 'hicolor-icon-theme')
-makedepends=('intltool' 'boost' 'gnome-doc-utils>=0.11.2')
-install=agave.install
+depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'boost')
+install=$pkgname.install
 source=("http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2"
         agave-0.4.7-mdv-fix-str-fmt.patch
-        schemebox.patch)
+        schemebox.patch
+        drop-libgnome.patch)
 md5sums=('93097881f28dcae1eca2800a763f77c3'
          'd96ddfe751d8fd4d13a443b94fafb0b6'
-         'c41adfd52ecbf837f4338e67693640fc')
+         'c41adfd52ecbf837f4338e67693640fc'
+         '7419d23329f847dcde12baa467b52135')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" # Fedora patch
   patch -Np1 -i "$srcdir/schemebox.patch" # gcs-schemebox patch
+  patch -Np1 -i "$srcdir/drop-libgnome.patch"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-scrollkeeper 
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-scrollkeeper --disable-gnome --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
-    "$pkgdir/etc/gconf/schemas"/*.schemas
-  rm -rf "$pkgdir/usr/etc"
-
-  sed -i "s/agave-icon.png/agave.png/" "$pkgdir/usr/share/applications/agave.desktop"
-  rm -f "${pkgdir}/etc/gconf/schemas"/*.schemas
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/agave/agave.install b/community/agave/agave.install
index 41343c50b..cb851dbc3 100644
--- a/community/agave/agave.install
+++ b/community/agave/agave.install
@@ -1,9 +1,8 @@
 pkgname=agave
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
+  gconfpkg --install ${pkgname}
+  xdg-icon-resource forceupdate
 }
 
 pre_upgrade() {
@@ -15,10 +14,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
diff --git a/community/agave/drop-libgnome.patch b/community/agave/drop-libgnome.patch
new file mode 100644
index 000000000..5dd704e34
--- /dev/null
+++ b/community/agave/drop-libgnome.patch
@@ -0,0 +1,66 @@
+diff -Naur agave-0.4.4.orig/src/dialogs/gcs-about-window.cc agave-0.4.4/src/dialogs/gcs-about-window.cc
+--- agave-0.4.4.orig/src/dialogs/gcs-about-window.cc	2007-11-02 04:16:16.000000000 +0100
++++ agave-0.4.4/src/dialogs/gcs-about-window.cc	2012-03-20 22:01:55.835021376 +0100
+@@ -26,9 +26,6 @@
+ #include <cstring>  // for strlen()
+ 
+ #include <config.h>
+-#ifdef HAVE_GNOME
+-#include <libgnome/gnome-url.h>
+-#endif // HAVE_GNOME
+ 
+ #include <gtkmm/icontheme.h>
+ 
+@@ -46,11 +43,8 @@
+         {
+             set_name(PACKAGE_NAME);
+ 
+-#ifdef HAVE_GNOME
+-            set_url_hook(sigc::mem_fun(*this, &AboutWindow::on_link_clicked));
+             set_website(PACKAGE_WEBSITE);
+             set_website_label(_("Project Website"));
+-#endif // HAVE_GNOME
+ 
+             Glib::ustring version(PACKAGE_VERSION);
+             set_version(version);
+@@ -112,15 +106,6 @@
+ 
+ 
+         void
+-        AboutWindow::on_link_clicked(Gtk::AboutDialog& dialog,
+-                const Glib::ustring& link)
+-        {
+-#ifdef HAVE_GNOME
+-            gnome_url_show(link.c_str(), 0);
+-#endif // HAVE_GNOME
+-        }
+-
+-        void
+         AboutWindow::on_response(int response_id)
+         {
+             if (response_id == Gtk::RESPONSE_DELETE_EVENT ||
+diff -Naur agave-0.4.4.orig/src/gcs-mainwindow-actions.cc agave-0.4.4/src/gcs-mainwindow-actions.cc
+--- agave-0.4.4.orig/src/gcs-mainwindow-actions.cc	2007-11-02 04:01:16.000000000 +0100
++++ agave-0.4.4/src/gcs-mainwindow-actions.cc	2012-03-20 22:01:10.637760066 +0100
+@@ -25,7 +25,6 @@
+ 
+ #include <vector>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-help.h>
+ #include <gtkmm/iconfactory.h>
+ #include <gtkmm/stock.h>
+ #include <gtkmm/clipboard.h>
+@@ -251,9 +250,10 @@
+     /* Help Menu Actions */
+     void MainWindow::on_action_help_contents(void)
+     {
+-        gnome_help_display("agave.xml",
+-                NULL /* link id */,
+-                NULL /* GError */);
++        gtk_show_uri (NULL,
++                "ghelp:agave",
++                gtk_get_current_event_time (),
++                NULL);
+     }
+ 
+ 
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
new file mode 100644
index 000000000..f46b20b60
--- /dev/null
+++ b/community/deja-dup/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 68245 2012-03-20 16:27:46Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=20.2
+pkgrel=3
+pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/deja-dup"
+license=('GPL')
+depends=('duplicity' 'gtk3' 'libgnome-keyring' 'libnotify' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('vala' 'intltool' 'itstool' 'nautilus')
+optdepends=('nautilus: backup extension')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/20/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
+md5sums=('678530be84f00af19c837f134613af21')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's/\"python\"/\"python2\"/' common/PythonChecker.c
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-compile --without-unity
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/deja-dup/deja-dup.install b/community/deja-dup/deja-dup.install
new file mode 100644
index 000000000..6ce7836d2
--- /dev/null
+++ b/community/deja-dup/deja-dup.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index b6674b0e1..ced3afecb 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 68229 2012-03-19 18:33:11Z arodseth $
+# $Id: PKGBUILD 68263 2012-03-20 22:36:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: kastor@fobos.org.ar
 
 pkgname=lrzip
 pkgver=0.612
-pkgrel=2
+pkgrel=3
 pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms"
 url="http://lrzip.kolivas.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 depends=('lzo2' 'bzip2' 'zlib' 'bash' 'gcc-libs')
 if [ "$CARCH" != "x86_64" ]
 then
-  depends+=('nasm')
+  makedepends+=('nasm')
   _flag="--enable-asm"
 fi
 options=('!libtool')
diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD
index fa0c71344..2f3253f55 100644
--- a/community/mc/PKGBUILD
+++ b/community/mc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60621 2011-12-15 18:20:41Z schuay $
+# $Id: PKGBUILD 68243 2012-03-20 16:04:03Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=mc
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
 arch=('i686' 'x86_64')
@@ -55,5 +55,4 @@ package() {
 		-i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('7d60c87d87b359831d976fa28034935e')
-sha1sums=('8a38468d11f9366b60615043554e71f87ee3cd56')
+md5sums=('54eba7680f3e24fbdb8d83e2cde9eca3')
diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD
index 46de5ec1b..d269c786b 100644
--- a/community/me-tv/PKGBUILD
+++ b/community/me-tv/PKGBUILD
@@ -5,7 +5,7 @@
 #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
 
 pkgname=me-tv
-pkgver=1.3.6
+pkgver=1.4.0.7
 pkgrel=1
 epoch=1
 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
@@ -13,15 +13,16 @@ arch=('i686' 'x86_64')
 url="https://launchpad.net/me-tv"
 license=('GPL')
 depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base')
-makedepends=('intltool')
+makedepends=('intltool' 'gnome-common')
 install='me-tv.install'
-source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz")
 options=('!emptydirs')
 
 build() {
 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	./autogen.sh
 	./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr
 	make
 
@@ -40,4 +41,5 @@ package() {
 	rm -rf "${pkgdir}/usr/etc/"
 
 }
-md5sums=('948a6957c3cd268717e139046269c410')
+
+md5sums=('1f7e10b063b869afcb00c6570061c1ef')
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
new file mode 100644
index 000000000..4cdeafce2
--- /dev/null
+++ b/community/minitube/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 68258 2012-03-20 19:50:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=minitube
+pkgver=1.7.1
+pkgrel=3
+pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
+arch=('i686' 'x86_64')
+url='http://flavio.tordini.org/minitube'
+license=('GPL')
+depends=('phonon')
+install="${pkgname}.install"
+source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('ce336b8cca8294f85d8e34b6a7828e38')
+
+build() {
+  cd "${srcdir}"/${pkgname}
+  qmake
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}
+  make install INSTALL_ROOT="${pkgdir}"
+}
diff --git a/community/minitube/minitube.install b/community/minitube/minitube.install
new file mode 100644
index 000000000..1c0de2e4f
--- /dev/null
+++ b/community/minitube/minitube.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 5bd9cac00..9b84c6b69 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67194 2012-03-05 08:58:08Z ibiru $
+# $Id: PKGBUILD 68267 2012-03-21 01:53:53Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -19,7 +19,7 @@ install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc'
         'mongodb.conf')
-md5sums=('f588cae93196b94599ec50e3c4956592'
+md5sums=('099bc701a3d190a040123c58958e8f67'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318')
 
@@ -29,9 +29,9 @@ build() {
   cd mongodb-src-r${pkgver}
 
   # fix python name for smoke tests
-  sed \
-    -e 's/python/&2/' \
-    -i SConstruct
+  #sed \
+  #  -e 's/python/&2/' \
+  #  -i SConstruct
 
   scons \
     all \
diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD
new file mode 100644
index 000000000..97e6b3257
--- /dev/null
+++ b/community/nautilus-sound-converter/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 68256 2012-03-20 19:47:24Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=nautilus-sound-converter
+pkgver=3.0.1
+pkgrel=3
+pkgdesc="Nautilus extension to convert audio files formats"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/nautilus-sound-converter/"
+license=('GPL')
+depends=('nautilus' 'libgnome-media-profiles')
+makedepends=('intltool')
+optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs')
+options=('!libtool')
+install=$pkgname.install
+source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz)
+sha1sums=('5319fab3b74df43b8e7c293dfdf88b754d3e9db9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/nautilus-sound-converter/nautilus-sound-converter.install b/community/nautilus-sound-converter/nautilus-sound-converter.install
new file mode 100644
index 000000000..d2da24898
--- /dev/null
+++ b/community/nautilus-sound-converter/nautilus-sound-converter.install
@@ -0,0 +1,17 @@
+pkgname=nautilus-sound-converter
+
+post_install() {
+  gconfpkg --install $pkgname
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 1523e8653..476adeef8 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,7 +1,8 @@
+# $Id: PKGBUILD 68238 2012-03-20 13:04:11Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.20_rel24.1
+pkgver=5.5.21_rel25.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
 arch=('i686' 'x86_64')
@@ -98,6 +99,6 @@ package() {
 	install -dm700 "${pkgdir}"/var/lib/mysql
 }
 
-md5sums=('0f61fde172ed1168a3ca9b7b003a6698'
+md5sums=('e0091c0e8213378f0b5756535fe5799f'
          '243864805611764a7e5883c1dba7afd8'
          '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community/raul/PKGBUILD b/community/raul/PKGBUILD
index 265a1eb90..ad603272e 100644
--- a/community/raul/PKGBUILD
+++ b/community/raul/PKGBUILD
@@ -1,32 +1,34 @@
-# $Id: PKGBUILD 68139 2012-03-18 16:41:01Z schiv $
+# $Id: PKGBUILD 68252 2012-03-20 16:47:35Z giovanni $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Max a.k.a. Synthead <synthead@gmail.com>
 # Contributor: christhemonkey <christhemonkey at gmail dot com>
 
 pkgname=raul
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ Realtime Audio Utility Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://drobilla.net/software/raul/"
 depends=('glib2')
 makedepends=('boost' 'python2')
 license=('GPL')
-install=$pkgname.install
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('8fa71a20db81fbed5fb6516dea383ea8')
+options=('!makeflags')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2"
+        'raul-0.8.0-ldconfig.patch')
+md5sums=('8fa71a20db81fbed5fb6516dea383ea8'
+         'e86cee755a503d25d37fb2bcaaf48a9b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/raul-0.8.0-ldconfig.patch"
 
   python2 waf configure --prefix=/usr
   python2 waf build $MAKEFLAGS
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  python2 waf install --destdir="$pkgdir"
+  python2 waf install --destdir="${pkgdir}"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/raul/raul-0.8.0-ldconfig.patch b/community/raul/raul-0.8.0-ldconfig.patch
new file mode 100644
index 000000000..a4780b68b
--- /dev/null
+++ b/community/raul/raul-0.8.0-ldconfig.patch
@@ -0,0 +1,10 @@
+--- a/wscript
++++ b/wscript
+@@ -153,7 +153,5 @@ def build(bld):
+ 	# Documentation
+ 	autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, top, out)
+ 
+-	bld.add_post_fun(autowaf.run_ldconfig)
+-
+ def test(ctx):
+ 	autowaf.run_tests(ctx, APPNAME, tests.split())
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
index f34b6c881..6c8937a9a 100644
--- a/community/soundkonverter/PKGBUILD
+++ b/community/soundkonverter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66120 2012-02-23 01:34:13Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 68236 2012-03-20 07:50:05Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=soundkonverter
-pkgver=1.3.3
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Front-end to various audio converters"
 arch=('i686' 'x86_64')
@@ -14,31 +14,34 @@ license=('GPL')
 depends=('kdemultimedia-kioslave' 'taglib')
 makedepends=('automoc4' 'cmake')
 optdepends=('cdrkit: cdda2wav backend'
-	    'faac: faac backend'
-	    'faad2: faad backend'
-	    'ffmpeg: ffmpeg backend'
-	    'flac: flac backend'
-	    'lame: lame backend'
-	    'mplayer: mplayer backend'
-	    'vorbis-tools: oggenc, oggdec backends'
-	    'speex: speexenc, speexdec backends'
-	    'vorbisgain: vorbisgain backend'
-	    )
+            'faac: faac backend'
+            'faad2: faad backend'
+            'ffmpeg: ffmpeg backend'
+            'flac: flac backend'
+            'fluidsynth: flouidsynth backend'
+            'lame: lame backend'
+            'mac: mac backend'
+            'mplayer: mplayer backend'
+            'mp3gain: mp3gain backend'
+            'speex: speexenc, speexdec backends'
+            'timidity++: midi backend'
+            'twolame: twolame backend'
+            'vorbisgain: vorbisgain backend'
+            'vorbis-tools: vorbis tools backend'
+            'wavpack: wavpack backend')
 install=$pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('cb61ee363f78f9dfaf807780ef65095d')
+md5sums=('4d3d1ccab74c2dd41971c3a4a4e7fb57')
 
 build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
+  cd "$srcdir"/$pkgname-$pkgver
+  cmake . \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
 }
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index e44857673..ba8950ed2 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153500 2012-03-15 08:12:48Z allan $
+# $Id: PKGBUILD 153952 2012-03-21 02:16:32Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=bash
 _basever=4.2
 _patchlevel=024 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -77,7 +77,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
-         'fe5d3a367f7d5f754214dc05e3d958ab'
+         '3546099a1b2f667adc9794f52e78e35b'
          '472f536d7c9e8250dc4568ec4cfaf294'
          '1100bc1dda2cdc06ac44d7e5d17864a3'
          'a7184b76eb4a079f10174a0a8f574819'
diff --git a/core/bash/system.bashrc b/core/bash/system.bashrc
index 84de2898c..a2231e861 100644
--- a/core/bash/system.bashrc
+++ b/core/bash/system.bashrc
@@ -20,4 +20,4 @@ case ${TERM} in
     ;;
 esac
 
-[ -r /etc/bash_completion   ] && . /etc/bash_completion
+[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index b017ba58b..6fde71628 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 147158 2012-01-23 15:27:38Z ibiru $
+# $Id: PKGBUILD 153932 2012-03-20 20:07:55Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('glibc' 'db')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'db' 'libnl')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -20,10 +20,12 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
 	iproute2-fhs.patch
-        fix-ip-l.patch)
+        fix-ip-l.patch
+        remove-libnl-headers.patch)
 sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
           '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73')
+          '2ec5513c44f89046438d65e2cda1a014010e3b73'
+          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,6 +35,7 @@ build() {
 
   #upstream fixes
   patch -Np1 -i "$srcdir/fix-ip-l.patch"
+  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
 
   ./configure
 
diff --git a/core/iproute2/remove-libnl-headers.patch b/core/iproute2/remove-libnl-headers.patch
new file mode 100644
index 000000000..921e1fa82
--- /dev/null
+++ b/core/iproute2/remove-libnl-headers.patch
@@ -0,0 +1,31 @@
+From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger@vyatta.com>
+Date: Tue, 10 Jan 2012 08:50:49 -0800
+Subject: [PATCH] iplt2p: remove unused libnl headers
+
+Leftover from change to original code.
+---
+ ip/ipl2tp.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
+index 042ddb4..97f98b6 100644
+--- a/ip/ipl2tp.c
++++ b/ip/ipl2tp.c
+@@ -23,13 +23,6 @@
+ #include <linux/if_arp.h>
+ #include <linux/ip.h>
+ 
+-#include <netlink/netlink.h>
+-#include <netlink/genl/genl.h>
+-#include <netlink/genl/family.h>
+-#include <netlink/genl/mngt.h>
+-#include <netlink/genl/ctrl.h>
+-#include <netlink/utils.h>
+-
+ #include <linux/genetlink.h>
+ #include <linux/l2tp.h>
+ 
+-- 
+1.7.6.5
+
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 8bdc641c8..09402fe53 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149749 2012-02-10 03:59:10Z eric $
+# $Id: PKGBUILD 153950 2012-03-21 02:16:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.90
+pkgver=2.02.95
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
@@ -14,8 +14,8 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
         lvm2_hook
         11-dm-initramfs.rules)
-sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6'
-          '61c4b46dff520f9c178062930ea9f169019f57e6'
+sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
+          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
           '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
           '7d63aa838703c9f986531a78164b556f765f5cce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index 2c49aec49..dcf09fca8 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149213 2012-02-06 11:42:36Z eric $
+# $Id: PKGBUILD 153948 2012-03-21 02:16:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=psmisc
-pkgver=22.15
+pkgver=22.16
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
@@ -10,13 +10,11 @@ url="http://psmisc.sourceforge.net/index.html"
 license=('GPL')
 groups=('base')
 depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz COMM_LEN-to-18.patch)
-sha1sums=('06f507d889afab70ac7ff20fbd419ca2ffcf90c0'
-          '6f45338fc34e453bea5273691a0cf81ed3e20fb8')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../COMM_LEN-to-18.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 9c4bfc17d..dd1d9e8ec 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cabal-install
 pkgver=0.10.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
@@ -28,7 +28,7 @@ package() {
     #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
     
     # add bash completion
-    install -d ${pkgdir}/etc/bash_completion.d
+    install -d ${pkgdir}/usr/share/bash-completion/completions
     install -m644 bash-completion/cabal \
-        ${pkgdir}/etc/bash_completion.d
+        ${pkgdir}/usr/share/bash-completion/completions
 }
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index d364c697f..6e2041ba4 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151475 2012-02-26 16:56:20Z andrea $
+# $Id: PKGBUILD 153918 2012-03-20 14:06:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.2.90
-_pkgver=4.2.90
+pkgver=1.3.0
+_pkgver=4.3.0
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@ depends=('kdevelop-pg-qt')
 makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('51511e78067a98a69003ba8bc36cf677dba9c69a'
-          '03747b9abcc6a7144a5e6ec914e513fc258c29b8')
+source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+sha1sums=('8ae280cf5085c473b6b95b3683629b49d19dfe12'
+          '398001b7d192af4c71bddb246dfd59d61db02618')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 6e6b4a14e..8a679c943 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151473 2012-02-26 16:55:47Z andrea $
+# $Id: PKGBUILD 153916 2012-03-20 14:05:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.2.90
+pkgver=4.3.0
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('459dbbc51f157b9a9322bf429bec84a881473f32')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('06a91f9ae0fc15bcec12a92bd9c30a7517b3b8e0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index d67701217..4b489927e 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151477 2012-02-26 16:56:52Z andrea $
+# $Id: PKGBUILD 153914 2012-03-20 14:01:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.2.90
-_pkgver=4.2.90
+pkgver=1.3.0
+_pkgver=4.3.0
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1049eb9c723225c24a38cf2e34381feb370013fc')
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('990ec335418445ae11b8ee11aa9a25729994de59')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 603db7711..9a58608bd 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 149819 2012-02-11 08:51:30Z andyrtr $
+# $Id: PKGBUILD 153938 2012-03-20 20:33:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.31
+pkgver=2.4.32
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
+makedepends=('cairo' 'valgrind')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
@@ -16,9 +16,9 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         COPYING
 #	git_fixes.diff
 )
-md5sums=('b8cf744ec113c6028fe0975b1133b649'
-         'fb8a15bf4aff5646c517373e8277f440'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1')
+sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
+          '825ff5e0c4238b31bdea52f104bfec8949270e25'
+          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 03bb66953..5430244f9 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -9,9 +9,9 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
 -AC_SUBST(PTHREADSTUBS_CFLAGS)
 -AC_SUBST(PTHREADSTUBS_LIBS)
 -
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE([udev],
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
 @@ -26,7 +26,6 @@
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index d50d65ecd..22eeeb6b8 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146606 2012-01-14 04:08:48Z eric $
+# $Id: PKGBUILD 153957 2012-03-21 03:38:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.13.4
-pkgrel=2
+pkgver=1.13.6
+pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mpg123"
@@ -15,13 +15,15 @@ optdepends=('sdl: for sdl audio support'
             'libpulse: for pulse audio support')
 conflicts=('mpg321')
 provides=('mpg321')
-options=('libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7fe195db9fe708c487a1d47a66e6e68d9b8e7a6e')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('61ae9edb105d4051858fe636fb2e54bd275cdfd9'
+          '19ac8fb68b499fba0167c242ee8d6af79b4a8dff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-int-quality --with-audio="alsa oss sdl jack pulse"
+  ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \
+    --with-audio="alsa oss sdl jack pulse"
   make
 }
 
diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD
index 769dbc020..c2341188c 100644
--- a/extra/quodlibet/PKGBUILD
+++ b/extra/quodlibet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140990 2011-10-20 22:44:26Z eric $
+# $Id: PKGBUILD 153859 2012-03-20 06:20:55Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=quodlibet
-pkgver=2.3.2
+pkgver=2.4
 pkgrel=1
 pkgdesc="An audio player written in pygtk"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support '
             'media-player-info: for media devices support')
 options=('!makeflags')
 source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('21bc5fb988ca6c09959fc7212c05272a126a5be5')
+sha1sums=('7e11cda2827bb0d04b7d2b7854b8a2854ed074c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,6 +32,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./setup.py install --prefix="${pkgdir}/usr"
-  install -D -m644 quodlibet/images/exfalso.png "${pkgdir}/usr/share/pixmaps/exfalso.png"
-  install -D -m644 quodlibet/images/quodlibet.png "${pkgdir}/usr/share/pixmaps/quodlibet.png"
+  install -D -m644 quodlibet/images/hicolor/64x64/apps/exfalso.png "${pkgdir}/usr/share/pixmaps/exfalso.png"
+  install -D -m644 quodlibet/images/hicolor/64x64/apps/quodlibet.png "${pkgdir}/usr/share/pixmaps/quodlibet.png"
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index ac58d1ea4..ea6041eac 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149747 2012-02-10 02:50:07Z eric $
+# $Id: PKGBUILD 153857 2012-03-20 05:18:53Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=434
-__hgrev=9140571d01ab
+_patchlevel=475
+__hgrev=74686ae0b181 	
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -18,8 +18,8 @@ makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
 source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
-sha1sums=('008d6a6e8af0bcfc8eb1f2c05db5621b9782dd4c'
-          'efdd011d2daa8238166b777b5b5e37e0a08bd7d4'
+sha1sums=('56529692b35df97e8a0f8610122957ba93033545'
+          'b52b3d290d5a005ace8a8aefa9e1eb0f4cc563e3'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 1fcad1c30..8eb28448c 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153348 2012-03-12 20:53:43Z andyrtr $
+# $Id: PKGBUILD 153936 2012-03-20 20:20:11Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,11 +13,14 @@ makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
 conflicts=('xorg-server<1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.diff)
+sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3'
+          '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-neomagic/git-fixes.diff b/extra/xf86-video-neomagic/git-fixes.diff
new file mode 100644
index 000000000..dafba0b2f
--- /dev/null
+++ b/extra/xf86-video-neomagic/git-fixes.diff
@@ -0,0 +1,616 @@
+From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue, 20 Jul 2010 20:15:29 +0000
+Subject: config: upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+---
+diff --git a/configure.ac b/configure.ac
+index 38cba3a..a80955b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+ # Checks for programs.
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 8f2454b..b3688ce 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+-
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
+-
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
++
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
++
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+--
+cgit v0.9.0.2-2-gbebe
+From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue, 20 Jul 2010 22:45:19 +0000
+Subject: config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index a80955b..1c7ff1a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+         1.2.5,
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+--
+cgit v0.9.0.2-2-gbebe
+From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue, 20 Jul 2010 23:41:31 +0000
+Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 1c7ff1a..aa17100 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
+ # Checks for programs.
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 00:24:42 +0000
+Subject: config: remove unrequired AC_HEADER_STDC
+
+Autoconf says:
+"This macro is obsolescent, as current systems have conforming
+header files. New programs need not use this macro".
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index aa17100..30c0e86 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,8 +79,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ 	      [#include "xorg-server.h"])
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+ 
+ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+--
+cgit v0.9.0.2-2-gbebe
+From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 01:44:57 +0000
+Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+This macro is called by PKG_CHECK_MODULES
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 30c0e86..86f016f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=neomagic
+--
+cgit v0.9.0.2-2-gbebe
+From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 13:27:42 +0000
+Subject: config: complete AC_INIT m4 quoting
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 86f016f..46cb0cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,9 +22,9 @@
+ 
+ AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+-        1.2.5,
++        [1.2.5],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-neomagic)
++        [xf86-video-neomagic])
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_CONFIG_HEADER([config.h])
+--
+cgit v0.9.0.2-2-gbebe
+From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 18:05:22 +0000
+Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 46cb0cc..7261ed5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic],
+         [xf86-video-neomagic])
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+--
+cgit v0.9.0.2-2-gbebe
+From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 18:37:41 +0000
+Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 7261ed5..1d0a3d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
+ AH_TOP([#include "xorg-server.h"])
+ 
+ AC_ARG_WITH(xorg-module-dir,
+-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+--
+cgit v0.9.0.2-2-gbebe
+From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 20:07:00 +0000
+Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 1d0a3d3..73dde93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
+ DRIVER_NAME=neomagic
+ AC_SUBST([DRIVER_NAME])
+ 
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+--
+cgit v0.9.0.2-2-gbebe
+From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed, 21 Jul 2010 20:49:04 +0000
+Subject: config: add comments for main statements
+
+---
+diff --git a/configure.ac b/configure.ac
+index 73dde93..befac41 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,18 +20,18 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
++# Initialize Autoconf
+ AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+         [1.2.5],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+         [xf86-video-neomagic])
+-
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+             AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir,
+             [moduledir="$libdir/xorg/modules"])
+ 
+ 
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ 
+ save_CFLAGS="$CFLAGS"
+--
+cgit v0.9.0.2-2-gbebe
+From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001
+From: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue, 28 Sep 2010 20:29:51 +0000
+Subject: Purge cvs tags.
+
+Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/man/neomagic.man b/man/neomagic.man
+index 9daffe5..af8181c 100644
+--- a/man/neomagic.man
++++ b/man/neomagic.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH NEOMAGIC __drivermansuffix__ __vendorversion__
+--
+cgit v0.9.0.2-2-gbebe
+From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 11 Oct 2011 17:43:51 +0000
+Subject: Use malloc/calloc/realloc/free directly
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/neo_dga.c b/src/neo_dga.c
+index 4227da6..3e2a02e 100644
+--- a/src/neo_dga.c
++++ b/src/neo_dga.c
+@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen)
+ 
+    while(pMode) {
+ 
+-	newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
++	newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
+ 
+ 	if(!newmodes) {
+-	   xfree(modes);
++	   free(modes);
+ 	   return FALSE;
+ 	}
+ 	modes = newmodes;
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index b12c125..c51dad4 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn)
+ {
+     if (pScrn->driverPrivate == NULL)
+ 	return;
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags)
+ 		    foundScreen = TRUE;
+ 		}
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ 
+@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags)
+ 	    foundScreen = TRUE;
+ 	}
+       }
+-      xfree(usedChips);
++      free(usedChips);
+     }
+ #endif
+ 
+-    xfree(devSections);
++    free(devSections);
+     return foundScreen;
+ }
+ 
+@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+     xf86CollectOptions(pScrn, NULL);
+     /* Process the options */
+     if (nPtr->NeoChipset == NM2070) {
+-	if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options))))
++	if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options))))
+ 	    return FALSE;
+ 	memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options));
+     } else {
+-	if (!(nPtr->Options = xalloc(sizeof(NEOOptions))))
++	if (!(nPtr->Options = malloc(sizeof(NEOOptions))))
+ 	    return FALSE;
+ 	memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
+     }
+@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     
+     if(nPtr->shadowFB) {
+ 	nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-	nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height);
++	nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height);
+ 	displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+ 	FBStart = nPtr->ShadowPtr;
+     } else {
+@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen)
+     if (nPtr->CursorInfo)
+ 	xf86DestroyCursorInfoRec(nPtr->CursorInfo);
+     if (nPtr->ShadowPtr)
+-	xfree(nPtr->ShadowPtr);
++	free(nPtr->ShadowPtr);
+ 
+     pScrn->vtSema = FALSE;
+     pScreen->CloseScreen = nPtr->CloseScreen;
+@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     if (NeoNew->reg) {
+ 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
+-	xfree(NeoNew->reg);
++	free(NeoNew->reg);
+ 	NeoNew->reg = NULL;
+     }
+ 
+diff --git a/src/neo_video.c b/src/neo_video.c
+index a9e1e25..0edae30 100644
+--- a/src/neo_video.c
++++ b/src/neo_video.c
+@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen)
+ 	    numAdaptors = 1;
+ 	    overlayAdaptors = &newAdaptor;
+ 	} else {
+-	    newAdaptors = xalloc((numAdaptors + 1) 
++	    newAdaptors = malloc((numAdaptors + 1) 
+ 				 * sizeof(XF86VideoAdaptorPtr*));
+ 	    if (newAdaptors){
+ 		memcpy(newAdaptors, overlayAdaptors, 
+@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen)
+ 	xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors);
+ 
+     if (newAdaptors)
+-	xfree(newAdaptors);
++	free(newAdaptors);
+ }
+ 
+ static XF86VideoEncodingRec NEOVideoEncodings[] =
+@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen)
+ #ifdef DEBUG
+     xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n");
+ #endif
+-    if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
+ 			      sizeof(DevUnion) + 
+ 			      sizeof(NEOPortRec))) == NULL){
+ 	return (NULL);
+@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen)
+ #ifdef DEBUG
+     xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n");
+ #endif
+-    if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){
++    if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){
+ 	return;
+     }
+ 
+@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
+ 
+     surface->width = width;
+     surface->height = height;
+-    if ((surface->pitches = xalloc(sizeof(int))) == NULL){
++    if ((surface->pitches = malloc(sizeof(int))) == NULL){
+ 	xf86FreeOffscreenLinear(linear);
+ 	return (BadAlloc);
+     }
+-    if ((surface->offsets = xalloc(sizeof(int))) == NULL){
+-	xfree(surface->pitches);
++    if ((surface->offsets = malloc(sizeof(int))) == NULL){
++	free(surface->pitches);
+ 	xf86FreeOffscreenLinear(linear);
+ 	return (BadAlloc);
+     }
+ 
+-    if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){
+-	xfree(surface->pitches);
+-	xfree(surface->offsets);
++    if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){
++	free(surface->pitches);
++	free(surface->offsets);
+ 	xf86FreeOffscreenLinear(linear);
+ 	return (BadAlloc);
+     }
+@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface)
+ 	NEOStopSurface(surface);
+ 
+     xf86FreeOffscreenLinear(pPriv->linear);
+-    xfree(surface->pitches);
+-    xfree(surface->offsets);
+-    xfree(surface->devPrivate.ptr);
++    free(surface->pitches);
++    free(surface->offsets);
++    free(surface->devPrivate.ptr);
+     return (Success);
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 11 Oct 2011 17:45:11 +0000
+Subject: Include <stdlib.h> for abs()
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index c51dad4..f8bca2c 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "scrnintstr.h"
+ #include "servermd.h"
+ 
++#include <stdlib.h>
+ #include <unistd.h>
+ 
+ /* Mandatory functions */
+--
+cgit v0.9.0.2-2-gbebe
+From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 21:50:28 +0000
+Subject: Fall back to shadowfb when XAA is unavailable
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index f8bca2c..a034f86 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+     if (nPtr->showcache)
+ 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
+ 		   "Show chache for debugging\n");
++
++    if (!xf86LoadSubModule(pScrn, "xaa")) {
++	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
++	nPtr->shadowFB = 1;
++    }
++
++    if (nPtr->shadowFB) {
++	if (!xf86LoadSubModule(pScrn, "shadow")) {
++	    RETURN;
++	}
++    }
++
+     if (nPtr->shadowFB) {
+         nPtr->noAccel = TRUE;
+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
+@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+ 	RETURN;
+     }
+ 
+-    if (!xf86LoadSubModule(pScrn, "xaa")) 
+-        RETURN;
+-
+-    if (nPtr->shadowFB) {
+-	if (!xf86LoadSubModule(pScrn, "shadow")) {
+-	    RETURN;
+-	}
+-    }
+-    
+     if (!nPtr->swCursor) {
+ 	if (!xf86LoadSubModule(pScrn, "ramdac"))
+ 	    RETURN;
+--
+cgit v0.9.0.2-2-gbebe
+From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 21:51:31 +0000
+Subject: Fix for new vgahw ABI
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index a034f86..509a77f 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+     if (!vgaHWGetHWRec(pScrn))
+ 	return FALSE;
+     hwp = VGAHWPTR(pScrn);
++    vgaHWSetStdFuncs(hwp);
+ 
+     /* Allocate the NeoRec driverPrivate */
+     if (!NEOGetRec(pScrn)) {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD
index 34c365780..33360962a 100644
--- a/gnome-unstable/at-spi2-atk/PKGBUILD
+++ b/gnome-unstable/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152283 2012-03-06 13:18:21Z heftig $
+# $Id: PKGBUILD 153879 2012-03-20 09:11:15Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.3.91
+pkgver=2.3.92
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 install=at-spi2-atk.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ba00ec5bbf8647d931be13d06f2bd9e8f82f4db61c1a64ee30c78f985d2aaa49')
+sha256sums=('ad910154504e6db9425fdbe5f2f1f4edd00aac1f0052164397b1314205e88e57')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD
index 481fcffe0..7790b0b7b 100644
--- a/gnome-unstable/at-spi2-core/PKGBUILD
+++ b/gnome-unstable/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152281 2012-03-06 13:17:26Z heftig $
+# $Id: PKGBUILD 153881 2012-03-20 09:12:53Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.3.91
+pkgver=2.3.92
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('69c249219af00dfa5f58da400efbc881a9f2fcf89c581aac7ff7d3046acd03ad')
+sha256sums=('5824e7d4dcf01543dae9800fdeff93bc1b503baa39461566a6e3f32bac6cbf24')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD
index 8818b50d3..c7109505d 100644
--- a/gnome-unstable/atk/PKGBUILD
+++ b/gnome-unstable/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152457 2012-03-07 15:37:06Z ibiru $
+# $Id: PKGBUILD 153875 2012-03-20 09:03:46Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.3.93
+pkgver=2.3.95
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('b551078c69132202d310afd180cac87c6f67e14f842a5fadde251479884db2f9')
+sha256sums=('a4d03a87f773b699fb88935296185bbe723d2d6eac9cc453a2f68a8b822b4540')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD
index 66d27e70b..0c01927dd 100644
--- a/gnome-unstable/cheese/PKGBUILD
+++ b/gnome-unstable/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152907 2012-03-10 16:26:31Z heftig $
+# $Id: PKGBUILD 153886 2012-03-20 09:27:21Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.3.90
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b5d30a9c6a067178ca0249f3acfc813ec3ab328a85512d63838e50e98eee2007')
+sha256sums=('93fdeabd969a07aabc39c4aa91bc25a67f6e8b7e95c4801cccdb36af356385da')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/cogl/PKGBUILD b/gnome-unstable/cogl/PKGBUILD
index 91fffe2d0..d4a2e7b14 100644
--- a/gnome-unstable/cogl/PKGBUILD
+++ b/gnome-unstable/cogl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152297 2012-03-06 14:21:16Z ibiru $
+# $Id: PKGBUILD 153920 2012-03-20 18:18:34Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.9.8
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fa3eae9e865c74c2b72a8bfa9f8b859c3458c81d4854c40e4690a85653fdc91e')
+sha256sums=('544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD
index 2ba5c26a5..b34addb5f 100644
--- a/gnome-unstable/empathy/PKGBUILD
+++ b/gnome-unstable/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152883 2012-03-10 15:13:57Z ibiru $
+# $Id: PKGBUILD 153907 2012-03-20 12:22:04Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.3.91
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('16d9016642ee6adb1c9abec82a44a9ff7ab33ca39a9735e7f6643cfe87e04ea5')
+sha256sums=('d5880cc7bc092ef8b3d6c9eaa903ebdc501326367aee793aca60a8fccea2ed5f')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -27,7 +27,6 @@ build() {
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
       --disable-static \
-      --disable-scrollkeeper \
       --disable-schemas-compile
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD
index 3bdcbe59e..da3bd1a97 100644
--- a/gnome-unstable/eog/PKGBUILD
+++ b/gnome-unstable/eog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152949 2012-03-10 19:24:58Z ibiru $
+# $Id: PKGBUILD 153899 2012-03-20 10:01:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.3.91
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('20900a333f0fdf63fc458218586d00a298f44c49ee8b8e6f0f31f38f7e9cfd96')
+sha256sums=('6b93fc469b8f250e4b41ddb0cf9834fbb06c0b92f86496a309e6434ac544b493')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/gdk-pixbuf2/PKGBUILD b/gnome-unstable/gdk-pixbuf2/PKGBUILD
index aa17d1744..d864cfa95 100644
--- a/gnome-unstable/gdk-pixbuf2/PKGBUILD
+++ b/gnome-unstable/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152274 2012-03-06 13:10:41Z ibiru $
+# $Id: PKGBUILD 153922 2012-03-20 18:40:33Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.25.2
+pkgver=2.26.0
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('e8bc5d7b823b5b8ecdf053225b12a9c26163ab23fcb68f176d3ec36ce96ff931')
+sha256sums=('a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d')
 
 build() {
   cd "gdk-pixbuf-$pkgver"
diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
index e3e538560..1baaf27b2 100644
--- a/gnome-unstable/gdm/PKGBUILD
+++ b/gnome-unstable/gdm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153851 2012-03-19 22:43:18Z ibiru $
+# $Id: PKGBUILD 153911 2012-03-20 13:36:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
 pkgver=3.3.92.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -34,7 +34,8 @@ build() {
       --disable-scrollkeeper \
       --disable-static \
       --without-tcp-wrappers \
-      --disable-schemas-compile
+      --disable-schemas-compile \
+      --with-systemd=no
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD
index 3b9f30d3d..996f6a442 100644
--- a/gnome-unstable/gedit/PKGBUILD
+++ b/gnome-unstable/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153014 2012-03-11 07:54:23Z heftig $
+# $Id: PKGBUILD 153926 2012-03-20 19:03:43Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.3.4
+pkgver=3.3.8
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dddd7f2028fa1241ea5d842653fbad299ac9bb31de1ffcf5a1b8912f4e315149')
+sha256sums=('b1dcf74755bcdb90e43f8f282a47f63156a170bbee40a4eee4a0f359dca69659')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/glib-networking/PKGBUILD b/gnome-unstable/glib-networking/PKGBUILD
index 5e34eee1d..3c521a6a0 100644
--- a/gnome-unstable/glib-networking/PKGBUILD
+++ b/gnome-unstable/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152287 2012-03-06 13:21:11Z ibiru $
+# $Id: PKGBUILD 153889 2012-03-20 09:33:20Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.31.20
+pkgver=2.31.22
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('82015c3601840b733d3f79298b49cce3708c064c3139975d56a44017cf162b5f')
+sha256sums=('961bbb6d62d79af130bc2088d7a2be5b381b27584ef79d5a7089476c4f0a9d8f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD
index 60b7d165a..e4979d39c 100644
--- a/gnome-unstable/gnome-bluetooth/PKGBUILD
+++ b/gnome-unstable/gnome-bluetooth/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 152897 2012-03-10 16:04:35Z ibiru $
+# $Id: PKGBUILD 153942 2012-03-20 22:01:59Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.3.4
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
 depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
+makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('045e4232b3adbb9219bde406c853ba8d652bb58ce7ea85323b51fc8c786abeea'
-            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
+        61-gnome-bluetooth-rfkill.rules
+        fix-build::http://git.gnome.org/browse/gnome-bluetooth/patch/?id=94a23c3a5194d527aae993edbc68a50695a3f93e)
+sha256sums=('081834f33a45829a108dab33e7d6bdeef9efdde9741bb55208327b38f425343c'
+            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474'
+            '357f4abfc62da3a7e87bc815daf698f258135707bcf302e46f5b189fbdbeaf95')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/fix-build"
+  gnome-autogen.sh
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -35,6 +39,4 @@ package() {
 
   install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \
                      "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo "/usr/lib/gnome-bluetooth" > "$pkgdir/etc/ld.so.conf.d/$pkgname.conf"
 }
diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD
index f6ec74785..a037b7c10 100644
--- a/gnome-unstable/gnome-documents/PKGBUILD
+++ b/gnome-unstable/gnome-documents/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153008 2012-03-11 07:34:58Z heftig $
+# $Id: PKGBUILD 153895 2012-03-20 09:47:24Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=0.3.90
+pkgver=0.3.92
 pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64)
@@ -14,8 +14,8 @@ makedepends=('intltool')
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0f7b103337a005bd7ed3134459a9163bf171ded67c6e96ba9e729ed6022f585d')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('8873070d7797bfc500483c05154c81dc06c2da8601984923da56770e0e9db027')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install
index 95114273e..1571179ca 100644
--- a/gnome-unstable/gnome-documents/gnome-documents.install
+++ b/gnome-unstable/gnome-documents/gnome-documents.install
@@ -1,7 +1,7 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  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/hicolor
 }
 
 post_upgrade() {
diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD
index ebd49c9ae..6b1de1b9b 100644
--- a/gnome-unstable/gnome-shell/PKGBUILD
+++ b/gnome-unstable/gnome-shell/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 153020 2012-03-11 08:53:19Z ibiru $
+# $Id: PKGBUILD 153944 2012-03-20 22:08:53Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.3.91
-pkgrel=0
+pkgver=3.3.92
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
 license=('GPL2')
 depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('566f78596dfd665f399c835f288dc4f42e161adc0f0a9d88f09dc72772299d2a')
+sha256sums=('1c66198324512742c3be6879d15294c41239941480a7669cd547d7f8106977fe')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  ./autogen.sh
-
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/gnome-unstable/gnome-system-monitor/PKGBUILD b/gnome-unstable/gnome-system-monitor/PKGBUILD
index 3cc679c9d..bd9bda8ec 100644
--- a/gnome-unstable/gnome-system-monitor/PKGBUILD
+++ b/gnome-unstable/gnome-system-monitor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153000 2012-03-11 06:59:53Z heftig $
+# $Id: PKGBUILD 153893 2012-03-20 09:44:33Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.3.91
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
@@ -14,17 +14,17 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('00d1c4bead6fc172f5a55d6f0f0606458cc7ed3df7d2eed155f285d791b71867')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e8b91973cfa0867b312435dbe4650169e05873d525d171de71d07c94337fe242')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
index e2957a570..70641526f 100644
--- a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
+++ b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
@@ -1,12 +1,12 @@
 pkgname=gnome-system-monitor
 
 post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
+    if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        gconfpkg --uninstall ${pkgname}
     fi
 }
 
diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD
index 56404bf4c..5bf395bd9 100644
--- a/gnome-unstable/gnome-themes-standard/PKGBUILD
+++ b/gnome-unstable/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152714 2012-03-09 01:38:14Z heftig $
+# $Id: PKGBUILD 153887 2012-03-20 09:30:22Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.3.91
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ replaces=('gnome-themes')
 conflicts=('gnome-themes')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5047414bf27142bf194481124801679c37a4a711ceee09951f5492d2127e2960')
+sha256sums=('bfcb95952e63a07b9c157b16530f19eea4f773e604e79986fb06d8c00edcc776')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD
index 745797518..c88604a04 100644
--- a/gnome-unstable/gtk3/PKGBUILD
+++ b/gnome-unstable/gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152289 2012-03-06 13:35:08Z ibiru $
+# $Id: PKGBUILD 153924 2012-03-20 18:53:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.3.18
+pkgver=3.3.20
 pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
@@ -15,11 +15,11 @@ backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('c63cc7ff19c28f73c1060f4b6168ef0f6cb359803abb990baa5c5f5a48f31f90'
+sha256sums=('2327df9b2eca97d4817a6adbf127bf77141c4bafb2f79b6a91c9495b272d8501'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-
 build() {
     cd "gtk+-$pkgver"
+    export CFLAGS+=" -g -O0"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD
index dd0fc3b9b..3b0283c62 100644
--- a/gnome-unstable/gtksourceview3/PKGBUILD
+++ b/gnome-unstable/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152774 2012-03-09 16:10:21Z ibiru $
+# $Id: PKGBUILD 153877 2012-03-20 09:06:52Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.3.4
+pkgver=3.3.5
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('90dea698561b437adf4ee4264cf5c52120a11824a9c5d38bbd7497ed99861086')
+sha256sums=('ab48b143ef2880906cf85799c709a9a431f18892d4ad39c31fe4ac737aa21ce9')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD
index 416e40082..30b8388ad 100644
--- a/gnome-unstable/libsoup/PKGBUILD
+++ b/gnome-unstable/libsoup/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 152455 2012-03-07 15:13:11Z ibiru $
+# $Id: PKGBUILD 153891 2012-03-20 09:38:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.37.91
-pkgrel=2
+pkgver=2.37.92
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('9faa8abce324c948cd51a5d9cb956d0edc32e996724d9b0d4b2f02d0903939ba')
+sha256sums=('c52fe22416f789e9395c27d4f589122e321cb903b7c6268a53d6c8c9235a3ef5')
 
 build() {
   cd "$pkgbase-$pkgver"
diff --git a/gnome-unstable/libwebkit/PKGBUILD b/gnome-unstable/libwebkit/PKGBUILD
index 0b722c1cb..92f3fa079 100644
--- a/gnome-unstable/libwebkit/PKGBUILD
+++ b/gnome-unstable/libwebkit/PKGBUILD
@@ -1,30 +1,22 @@
-# $Id: PKGBUILD 152682 2012-03-08 17:33:57Z ibiru $
+# $Id: PKGBUILD 153905 2012-03-20 12:10:42Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.7.91
+pkgver=1.7.92
 pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa' 'gtk-doc')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz
-        webkit-gtk-1.7.90-parallel-make-hack.patch
-        python.patch)
-sha256sums=('9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545'
-            'e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73'
-            '29b82e47277d982bc57a7ba967d28ae76e07556986627c2e456694b699ae0e09')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
 
 build() {
   cd "$srcdir/webkit-$pkgver"
-  patch -Np1 -i $srcdir/webkit-gtk-1.7.90-parallel-make-hack.patch
-  patch -Np1 -i $srcdir/python.patch
-  autoreconf -I Source/autotools -fi
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )
@@ -38,13 +30,7 @@ _build() {
     --with-unicode-backend=icu \
     --enable-geolocation=no \
     --enable-spellcheck "$@"
-#  make all stamp-po
-#  until parallel building is fixed
-  make all-built-sources-local
-  make all-ltlibraries-local
-  make all-programs-local
-  make all-data-local
-  make stamp-po
+  make all stamp-po
 }
 
 package_libwebkit() {
diff --git a/gnome-unstable/metacity/PKGBUILD b/gnome-unstable/metacity/PKGBUILD
index a72350a8c..66050d687 100644
--- a/gnome-unstable/metacity/PKGBUILD
+++ b/gnome-unstable/metacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152837 2012-03-09 19:35:19Z ibiru $
+# $Id: PKGBUILD 153930 2012-03-20 19:32:17Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
-pkgver=2.34.2
+pkgver=2.34.3
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3ca1a658bc0daa8b31872b89add2c73892a5369e767cafd636f2b15bd0675ee6')
+sha256sums=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD
index 20db3cd51..3e2e1db45 100644
--- a/gnome-unstable/mutter/PKGBUILD
+++ b/gnome-unstable/mutter/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 153019 2012-03-11 08:52:45Z ibiru $
+# $Id: PKGBUILD 153941 2012-03-20 22:01:20Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.3.91
-pkgrel=0
+pkgver=3.3.92
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6a5dfa56d0f2eba5c7adefb2bc55dcb26d5915e95619499276c4b6ac6587e0d9')
+sha256sums=('fd31de6084dd5a11cfed5528af679e71f7a195267c5ac7705f2090c990b5c1f7')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static \
diff --git a/gnome-unstable/nautilus/PKGBUILD b/gnome-unstable/nautilus/PKGBUILD
index 17b4e42c4..1de479788 100644
--- a/gnome-unstable/nautilus/PKGBUILD
+++ b/gnome-unstable/nautilus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152893 2012-03-10 15:48:45Z ibiru $
+# $Id: PKGBUILD 153883 2012-03-20 09:17:17Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.3.91
+pkgver=3.3.92
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('713d0352f8be25133bae1974f74788852e16d9ecc5131b8bd4601bb67c7247cb')
+sha256sums=('375d9076820ff93073652b257d036408b9ebd692fa574cfd3dc9990f60ec519d')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/sushi/PKGBUILD b/gnome-unstable/sushi/PKGBUILD
index faa7cbcb9..7539eeafb 100644
--- a/gnome-unstable/sushi/PKGBUILD
+++ b/gnome-unstable/sushi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152966 2012-03-10 21:32:18Z ibiru $
+# $Id: PKGBUILD 153897 2012-03-20 09:51:50Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=0.3.91
+pkgver=0.3.92
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtkso
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4c5044507329671acbb28c6c548be4c5dd3508a14436703d845be131ac91b14f')
+sha256sums=('6400c62546a0d68c1a95cc2ad39307ff2a05a46ad8685b3d72337d7380620285')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/gnome-unstable/telepathy-farstream/PKGBUILD b/gnome-unstable/telepathy-farstream/PKGBUILD
index 35728eeb0..22dee4611 100644
--- a/gnome-unstable/telepathy-farstream/PKGBUILD
+++ b/gnome-unstable/telepathy-farstream/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152822 2012-03-09 18:16:38Z ibiru $
+# $Id: PKGBUILD 153928 2012-03-20 19:10:21Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-farstream
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('telepathy-farsight')
 replaces=('telepathy-farsight')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ec97eb4bbe302246e012bcb53712a9e5')
+md5sums=('9a5de84f1f4bb4505cc982b4a7fea539')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 733d34aa3..e9282b5aa 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 147201 2012-01-24 06:36:12Z bisson $
+# $Id: PKGBUILD 150594 2012-02-18 18:25:33Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
-pkgver=2011.12
+pkgver=2012.2
 pkgrel=2
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
@@ -37,51 +38,53 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          'a8a962370cd0128465d514e6a1f74130')
 
 package() {
-	cd ${srcdir}
+	cd ${pkgdir}
 
 	#
 	# setup root filesystem
 	#
 	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
-		install -d -m755 ${pkgdir}/${d}
+		install -d -m755 ${d}
 	done
-	install -d -m555 ${pkgdir}/proc
-	install -d -m0750 ${pkgdir}/root
-	install -d -m1777 ${pkgdir}/tmp
+	install -d -m555 proc
+	install -d -m0750 root
+	install -d -m1777 tmp
 	# vsftpd won't run with write perms on /srv/ftp
-	install -d -m555 -g ftp ${pkgdir}/srv/ftp
+	install -d -m555 -g ftp srv/ftp
 
 	# setup /etc
-	install -d ${pkgdir}/etc/{ld.so.conf.d,skel,profile.d}
+	install -d etc/{ld.so.conf.d,skel,profile.d}
 	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
-		install -m644 ${srcdir}/${f} ${pkgdir}/etc/
+		install -m644 ${srcdir}/${f} etc/
 	done
-	ln -s /proc/self/mounts ${pkgdir}/etc/mtab
+	ln -s /proc/self/mounts etc/mtab
 	for f in gshadow shadow crypttab; do
-		install -m600 ${srcdir}/${f} ${pkgdir}/etc/
+		install -m600 ${srcdir}/${f} etc/
 	done
-	touch ${pkgdir}/etc/arch-release
-	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf
+	touch etc/arch-release
+	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first lib/modprobe.d/usb-load-ehci-first.conf
 
 	# setup /var
-	for d in cache/man local opt log/old lib/misc empty; do
-		install -d -m755 ${pkgdir}/var/${d}
+	for d in cache/man local opt log/old lib/misc empty run; do
+		install -d -m755 var/${d}
 	done
-	install -d -m1777 ${pkgdir}/var/{tmp,spool/mail}
+	install -d -m1777 var/{tmp,spool/mail,lock}
 	# allow setgid games to write scores
-	install -d -m775 -g games ${pkgdir}/var/games
-	ln -s /var/spool/mail ${pkgdir}/var/mail
-	ln -s /run ${pkgdir}/var/run
-	ln -s /run/lock ${pkgdir}/var/lock
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	# not ready yet, needs possible change in pacman or other magic
+	# is fixed by initscripts on next boot
+#	ln -s ../run var/run
+#	ln -s ../run/lock var/lock
 
 	#
 	# setup /usr hierarchy
 	#
 	for d in bin include lib sbin share/misc src; do
-		install -d -m755 ${pkgdir}/usr/${d}
+		install -d -m755 usr/${d}
 	done
 	for d in $(seq 8); do
-		install -d -m755 ${pkgdir}/usr/share/man/man${d}
+		install -d -m755 usr/share/man/man${d}
 	done
 
 
@@ -89,7 +92,7 @@ package() {
 	# setup /usr/local hierarchy
 	#
 	for d in bin etc games include lib man sbin share src; do
-		install -d -m755 ${pkgdir}/usr/local/${d}
+		install -d -m755 usr/local/${d}
 	done
-	ln -s ../man ${pkgdir}/usr/local/share/man
+	ln -s ../man usr/local/share/man
 }
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 0ecc27e65..38d21a85b 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -1,24 +1,24 @@
 post_install() {
 	[ -f var/log/lastlog ] ||  : >var/log/lastlog
 	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
-	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
+	[ -f var/log/btmp ]    || (: >var/log/btmp && chmod 600 var/log/btmp)
 	# workaround for bug #7194
 	# readded due to bug #9465
 	# please do not remove!
-	bin/chmod 1777 var/spool/mail tmp var/tmp var/lock
+	chmod 1777 var/spool/mail tmp var/tmp var/lock
 }
 
 # args: <group> [options]
 _addgroup() {
-	if ! bin/grep -q "^$1:" etc/group; then
-		usr/sbin/groupadd ${@} >/dev/null
+	if ! getent group "$1"; then
+		groupadd "$@" >/dev/null
 	fi
 }
 
 # args: <group> [options]
 _adduser() {
-	if ! bin/grep -q "^$1:" etc/passwd; then
-		usr/sbin/useradd ${@} >/dev/null
+	if ! getent passwd "$1"; then
+		useradd "$@" >/dev/null
 	fi
 }
 
@@ -37,23 +37,23 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false http
+	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 
 	# sync gshadow to group (fixes FS#19869
-	if ! bin/grep -q '^rfkill:' etc/gshadow; then
-		usr/sbin/grpconv >/dev/null
+	if ! grep -q '^rfkill:' etc/gshadow; then
+		grpconv >/dev/null
 	fi
 
-	if ! bin/grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
-		bin/echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
+	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
+		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
 	fi
 
 	# set "Last password change" > 0; otherwise su $user wont work
 	for user in bin daemon mail ftp http nobody; do
-		if LANG=C usr/bin/chage -l ${user} | bin/grep -q 'password must be changed'; then
-			usr/bin/chage -d 14871 ${user}
+		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
+			chage -d 14871 ${user}
 		fi
 	done
 }
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 7fcc8e77e..e792acf9f 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149297 2012-02-06 17:49:28Z andrea $
+# $Id: PKGBUILD 153517 2012-03-15 13:55:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -22,11 +22,13 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch'
-        'fix-knotify-filepath.patch'
+        'fix-kmail-crash.patch'
+        'use-pythondontwritebytecode.patch'
         'khtml-fsdg.diff')
 sha1sums=('ec393b096003f1dd57c5e2987381b086ba1b363e'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          '081b0663480568359120b573d26abb91e1a348c0'
+          'a1e35760d5b4e29471ad357c963a343c67200f32'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -35,8 +37,11 @@ build() {
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
 
-       # https://bugs.kde.org/show_bug.cgi?id=285028
-       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+       # Upstream (FS#28907)
+       patch -p1 -i "${srcdir}"/fix-kmail-crash.patch
+
+       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
 
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
new file mode 100644
index 000000000..27caa25f0
--- /dev/null
+++ b/libre/kdelibs-libre/fix-kmail-crash.patch
@@ -0,0 +1,71 @@
+commit 979b0436510e7807c054e79c40c3753834ac2863
+Author: Sebastian Trueg <trueg@kde.org>
+Date:   Thu Mar 15 09:14:35 2012 +0100
+
+    Thread-safe ResourceWatcher handling.
+    
+    We simply perform all RW operations in the manager thread.
+    
+    BUG: 295474
+    FIXED-IN: 4.8.2
+
+diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
+index abe55ea..9d45228 100644
+--- a/nepomuk/core/resourcedata.cpp
++++ b/nepomuk/core/resourcedata.cpp
+@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
+     if( !m_uri.isEmpty() ) {
+         m_rm->m_initializedData.remove( m_uri );
+         if( m_rm->m_watcher && m_addedToWatcher ) {
+-            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
++            // See load() for an explanation of the QMetaObject call
++            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
+             m_addedToWatcher = false;
+         }
+     }
+@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
+         m_cache.clear();
+ 
+         if(!m_rm->m_watcher) {
++            //
++            // The ResourceWatcher is not thread-safe. Thus, we need to ensure the safety ourselves.
++            // We do that by simply handling all RW related operations in the manager thread.
++            // This also means to invoke methods on the watcher through QMetaObject to make sure they
++            // get queued in case of calls between different threads.
++            //
+             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
++            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
+             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
+-            m_rm->m_watcher->start();
++            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
+         }
+         else {
+-            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
++            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
+         }
+         m_addedToWatcher = true;
+ 
+diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
+index 06b9622..92b12f5 100644
+--- a/nepomuk/core/resourcewatcher.h
++++ b/nepomuk/core/resourcewatcher.h
+@@ -93,6 +93,7 @@ namespace Nepomuk {
+          */
+         virtual ~ResourceWatcher();
+ 
++    public Q_SLOTS:
+         /**
+          * \brief Add a type to be watched.
+          *
+@@ -204,7 +205,6 @@ namespace Nepomuk {
+          */
+         QList<Types::Property> properties() const;
+ 
+-    public Q_SLOTS:
+         /**
+          * \brief Start the signalling of changes.
+          *
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
new file mode 100644
index 000000000..bab46a9a2
--- /dev/null
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -0,0 +1,80 @@
+--- cmake/modules/PythonMacros.cmake
++++ cmake/modules/PythonMacros.cmake
+@@ -23,40 +23,42 @@
+   # Install the source file.
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+ 
+-  # Byte compile and install the .pyc file.        
+-  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+-  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+-  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+-  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+-  if(WIN32)
+-    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+-  endif(WIN32)
+-
+-  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+-  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+-  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+-  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+-  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ELSE(_abs_bin_py STREQUAL ${_absfilename})
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
++
++    if(WIN32)
++      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
++
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
++    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
++
++    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++
++    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
++    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ELSE(_abs_bin_py STREQUAL ${_absfilename})
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ 
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ ENDMACRO(PYTHON_INSTALL)
diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
index 8aa81451f..aee13b195 100644
--- a/multilib/lib32-libdrm/PKGBUILD
+++ b/multilib/lib32-libdrm/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 66938 2012-03-01 21:43:38Z lcarlier $
+# $Id: PKGBUILD 68261 2012-03-20 21:03:19Z bluewind $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.31
+pkgver=2.4.32
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 arch=(x86_64)
@@ -15,8 +16,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
         no-pthread-stubs.patch)
 #	git_fixes.diff)
-md5sums=('b8cf744ec113c6028fe0975b1133b649'
-         '0c423f6f886a3a8d6a8834224de95bcf')
+sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
+          '1a9000f4c94d5bd13555e13e6e51716bf92a0eb8')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/multilib/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch
index 6ad4a48ee..721626c0a 100644
--- a/multilib/lib32-libdrm/no-pthread-stubs.patch
+++ b/multilib/lib32-libdrm/no-pthread-stubs.patch
@@ -9,9 +9,9 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
 -AC_SUBST(PTHREADSTUBS_CFLAGS)
 -AC_SUBST(PTHREADSTUBS_LIBS)
 -
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE([udev],
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
 @@ -26,7 +26,6 @@
diff --git a/testing/capi4hylafax/PKGBUILD b/testing/capi4hylafax/PKGBUILD
new file mode 100644
index 000000000..ff9680255
--- /dev/null
+++ b/testing/capi4hylafax/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 153867 2012-03-20 08:29:04Z tpowa $
+#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=capi4hylafax
+pkgver=010300
+pkgrel=6
+pkgdesc="capi plugin for hylafax to enable isdn faxing"
+arch=(i686 x86_64)
+url="ftp://ftp.avm.de/tools"
+license=('GPL')
+depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
+source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
+	config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07')
+install=capi4hylafax.install
+backup=(var/spool/hylafax/etc/config.faxCAPI)
+
+build() {
+  cd "$srcdir"/$pkgname-01.03.00
+# fix config file
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
+  autoreconf --force --install
+  ./configure
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-01.03.00
+  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
+  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
+  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
+  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
+  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
+# adding FIFO
+  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+# fix /var/spool/hylafax permission
+  chown 10 "$pkgdir"/var/spool/hylafax
+  chgrp 14 "$pkgdir"/var/spool/hylafax
+# adding udev rule
+  mkdir -p "$pkgdir"/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
+# CAPI devices
+SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
+SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
+
+EOF
+# fix c2faxadd
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
+  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
+}
diff --git a/testing/capi4hylafax/capi4hylafax.install b/testing/capi4hylafax/capi4hylafax.install
new file mode 100644
index 000000000..20c2d8f63
--- /dev/null
+++ b/testing/capi4hylafax/capi4hylafax.install
@@ -0,0 +1,16 @@
+post_install() {
+cat << EOF
+For more information about setting up the package, please have a look here:
+"http://wiki.archlinux.org/index.php/capi4hylafax"
+EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+cat << EOF
+Please remove your additions to /var/spool/hylafax/etc/config
+EOF
+}
diff --git a/testing/capi4hylafax/capi4hylafax.rc b/testing/capi4hylafax/capi4hylafax.rc
new file mode 100755
index 000000000..51025b020
--- /dev/null
+++ b/testing/capi4hylafax/capi4hylafax.rc
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/c2faxrecv`
+case "$1" in
+  start)
+    stat_busy "Starting capi4hylafax"
+    if [ -z "$PID" ]; then
+    /usr/bin/c2faxrecv > /dev/null &
+       faxmodem faxCAPI
+    fi
+    if [ ! -f /var/run/faxq.pid ]; then
+       stat_fail
+       echo "ERROR: hylafax is not running"
+       exit 1
+    fi
+    if [ ! -f /var/run/hfaxd.pid ]; then
+    stat_fail
+    echo "ERROR: hylafax is not running"
+    exit 1
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping capi4hylafax"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/capi4hylafax/config.faxCAPI b/testing/capi4hylafax/config.faxCAPI
new file mode 100644
index 000000000..b2137757a
--- /dev/null
+++ b/testing/capi4hylafax/config.faxCAPI
@@ -0,0 +1,397 @@
+#
+# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP
+#
+
+# Grunds�tzliches:
+# - Es gibt f�r jeden Wert einen Standardzustand (default), sodass jede Zeile
+#   der Datei oder auch das komplette Configfile ausgelassen werden kann.
+# - Es gibt ausschlie�lich ein Configfile, in dem alle n�tigen Angaben f�r
+#   "c2faxsend/-receive" eingetragen werden k�nnen.
+# - Werden f�r HylaFAX mehrere virtuelle Ger�te (devices) angelegt, muss es
+#   f�r jedes Device ein Configfile im Format config.[DeviceName] geben.
+#   Dessen Existenz wird von HylaFAX �berpr�ft. Ohne dieses File kann die
+#   Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer
+#   solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile
+#   oder ein minimales "dummy"-ConfigFile nachgewiesen werden.
+#
+# Basics:
+# - There is a default condition for each value, such that each line of the
+#   file or the complete configfile can be left out.
+# - There is only one configfile in which all information required for
+#   "c2faxsend/-receive" can be entered.
+# - If multiple virtual devices are created for HylaFAX, there must be a
+#   Configfile in the format config.[DeviceName] for each device. HylaFAX
+#   checks that this file exists. Without this file, it is not possible to
+#   start working with the device. The easiest way to establish the existence
+#   of such a file is to create a link to this ConfigFile or a minimum
+#   "dummy" ConfigFile.
+
+
+# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die
+# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die
+# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb
+# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert.
+#
+# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX-
+# compatible operation or in which received faxes are to be saved in
+# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in
+# the directory $(SpoolDir)/recvq.
+#
+# default   /var/spool/hylafax
+#
+SpoolDir:               /var/spool/hylafax
+
+
+# "FaxRcvdCmd" gibt das Skript an, das ausgef�hrt wird, sobald ein Fax
+# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter
+# �bergeben als f�r HylaFAX (mehr dazu im sample_faxrcvd).
+#
+# "FaxRcvdCmd" indicates the script performed whenever a fax is
+# received. Parameters other than the ones for HylaFAX are returned in
+# stand-alone operation (see sample_faxrcvd for more information).
+#
+# default   /var/spool/hylafax/bin/faxrcvd
+#
+FaxRcvdCmd:             /var/spool/hylafax/bin/faxrcvd
+
+
+# "PollRcvdCmd" gibt das Skript an, das ausgef�hrt wird, sobald ein
+# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden
+# andereParameter �bergeben als f�r HylaFAX (mehr dazu im
+# sample_faxrcvd).
+#
+# "PollRcvdCmd" indicates the script performed whenever a fax was
+# received by fax polling. Parameters other than the ones for HylaFAX
+# are returned in stand-alone operation (see sample_faxrcvd for more
+# information).
+#
+# default   /var/spool/hylafax/bin/pollrcvd
+#
+PollRcvdCmd:             /var/spool/hylafax/bin/pollrcvd
+
+
+# "FaxReceiveUser" ist der User, als der c2faxrecv ausgef�hrt wird.
+# Die �nderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte
+# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag
+# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp"
+# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von
+# /dev/capi20 nicht ge�ndert werden sollen oder Ihre Linux-Distribution einen
+# anderen User voraussetzt.
+#
+# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be
+# changed only by the Superuser or "root" user. If c2faxrecv is started by
+# another user, this entry will be ignored. Here it is a good idea to enter a
+# value other than the hylafax default value "uucp", for instance, if the
+# rights of /dev/capi20 are not to be changed or your Linux distribution
+# requires another user.
+#
+# default   ""
+#
+FaxReceiveUser:         uucp
+FaxReceiveGroup:	uucp
+
+
+# Im "LogFile" werden Informationen �ber den Faxablauf abgespeichert.
+#
+# Information about the order of events in faxing are saved in the "LogFile".
+#
+# default   ""
+#
+LogFile:                /var/spool/hylafax/log/capi4hylafax
+
+
+# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile
+# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles.
+#
+# The "LogTraceLevel" command indicates the amount of data written in a
+# LogFile. The range goes from 0 = nothing to 4 = many.
+#
+# default   0
+#
+LogTraceLevel:          0
+
+
+# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade
+# erw�hnte LogFile als auch die LogFiles f�r HylaFAX angelegt werden.
+#
+# "LogFileMode" is the mode, on the basis of which both the LogFile just
+# mentioned and the LogFiles for HylaFAX are generated.
+#
+# default   0600
+#
+LogFileMode:            0600
+
+
+# Die geschweiften Klammern geben Anfang und Ende einer Section an.
+# Jede Section darf eine oder mehrere SubSections enthalten.
+# SubSubSections sind nicht erlaubt.
+# Dabei enth�lt die Section Angaben zu einem virtuellen Device;
+# die Subsection die Angaben f�r die Rufannahme jedes Controllers.
+# Es k�nnen beliebig viele Sections und, darin enthalten, jeweils beliebig
+# viele Subsections erzeugt werden.
+# Jede Section muss aber einen anderen HylafaxDeviceName erhalten;
+# zus�tzlich muss in jeder Subsection innerhalb einer Section ein anderer
+# Controller aufgef�hrt werden. Beim Stand-Alone-Betrieb ist eine Section mit
+# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die
+# virtuellen DeviceNamen keine Rolle spielen.
+#
+# The curved brackets indicate the beginning and end of a section.
+# Each section may contain one or more subsections.
+# SubSubSections are not permitted.
+# The section contains information about a virtual device; the subsection the
+# call acceptance information for each controller.
+# Any number of sections containing any number of subsections may be
+# generated, but each section must receive a different HylafaxDeviceName; and
+# a different controller must be listed in every subsection within a section.
+# For stand-alone operation, it is sufficient to have just one section with
+# as many subsections as required, since virtual DeviceNames do not play
+# any role in this mode of operation.
+#
+{
+
+    # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als
+    # "virtuelles Modem" anmeldet. Sollen f�r HylaFAX mehrere dieser "Modems"
+    # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen
+    # HylafaxDeviceName an.
+    #
+    # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as
+    # a "virtual modem". If multiple "modems" are to be generated for HylaFAX,
+    # simply create a new section with another HylafaxDeviceName.
+    #
+    # default   faxCAPI
+    #
+    HylafaxDeviceName:          faxCAPI
+
+
+    # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert
+    # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.)
+    # festgelegt.
+    #
+    # "RecvFileMode" is the mode, in which received faxes are saved. User and
+    # Group of the file are determined by the FaxReceiveUser (see above).
+    #
+    # default   0600
+    #
+    RecvFileMode:               0600
+
+
+    # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite
+    # mitgeteilt (sichtbar z. B. im Fax-Journal).
+    #
+    # "FAXNumber" is the fax number of the computer itself and is transmitted
+    # to the remote site (visible in the Fax Journal).
+    #
+    # default   ""
+    #
+    FAXNumber:                  +49.00.00000
+
+
+    # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der
+    # Kopfzeile. Ein leerer Eintrag f�hrt dazu, dass keine Fax-Kopfzeile
+    # eingef�gt wird.
+    #
+    # "LocalIdentifier" is the part of the fax header which can be configured
+    # from CAPI. An empty entry specifies an empty header.
+    #
+    # default   ""
+    #
+    LocalIdentifier:            "AVM CAPI4HylaFAX"
+
+
+    # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann
+    # durch "MaxConcurrentRecvs" angepa�t werden. Diese Anzahl wird
+    # durch die Anzahl der durch die Hardware zur Verf�gung
+    # gestellten B-Kan�le begrenzt.
+    #
+    # The maximum number of faxes that can be received at the same
+    # time can be adjusted using "MaxConcurrentRecvs". This number
+    # is limited by the number of B channels provided by the hardware.
+    #
+    # default   2
+    #
+    MaxConcurrentRecvs:         2
+
+
+    # ----------- outgoing params -----------
+
+    # "OutgoingController" gibt den Controller an, �ber den eine externe
+    # Verbindung aufgebaut werden soll.
+    #
+    # "OutgoingController" indicates the controller which is to be used to
+    # establish an external connection.
+    #
+    # default   1
+    #
+    OutgoingController:         1
+
+
+    # Die "OutgoingMSN" ist die MSN, die f�r ausgehenden Faxe benutzt wird.
+    #
+    # The "OutgoingMSN" is the MSN used for outgoing faxes.
+    #
+    # default   ""
+    #
+    OutgoingMSN:
+
+
+    # CLIR (Rufnummernunterdr�ckung) kann �ber "SuppressMSN" und den Wert (0)
+    # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden.
+    #
+    # CLIR (Calling Line Identification Restriction) can be switched off using
+    # the value (0) or switched back on by entering the value (1).
+    #
+    # default   0
+    #
+    SuppressMSN:                0
+
+
+    # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei
+    # Nebenstellenanlagen wichtig, bei denen f�r den Aufbau einer externen
+    # Verbindung eine Ziffer vorgew�hlt werden muss.
+    #
+    # "NumberPrefix" is set to precede each telephone number. This is
+    # important for PBX systems which require that a number be dialed to
+    # obtain an outside line.
+    #
+    # default   ""
+    #
+    NumberPrefix:
+
+
+    # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf
+    # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz
+    # Audio-Verbindung hergestellt.
+    #
+    # When in "UseISDNFaxService" the value is = 1, an outoing call will be
+    # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz
+    # audio connection is established.
+    #
+    # default   0
+    #
+    UseISDNFaxService:          0
+
+
+    # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die
+    # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die
+    # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des
+    # Wertes 0 nutzt die gesamte Wartezeit.
+    #
+    # The duration in seconds you wait for the remote site to accept your
+    # outgoing call In this way you do not have to use the entire ringing
+    # duration preset by the telephone company. The default value 0 uses the
+    # entire ringing duration.
+    #
+    # default   0
+    #
+    RingingDuration:            0
+
+
+    # ----------- incoming params -----------
+    {
+
+        # Controller, f�r den diese Subsection gilt.
+        #
+        # Controller for which this subsection is valid.
+        #
+        # default   1
+        #
+        Controller:             1
+
+
+        # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung
+        # "Sprache" angenommen.
+        #
+        # If "AcceptSpeech" is set to 1, the service indicator "Voice" also
+        # will be accepted.
+        #
+        # default   0
+        #
+        AcceptSpeech:           1
+
+
+        # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen.
+        #
+        # If DDI is to be used, "UseDDI" should be set to a value of 1.
+        #
+        # default   0
+        #
+        UseDDI:                 0
+
+
+        # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen.
+        # Der Standardwert f�hrt zu keinem korrekten Ergebnis und
+        # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer
+        # ver�ndert werden.
+        #
+        # "DDIOffset" indicates the DDI offset number which precedes
+        # extension number. Because the default value can't guarantee
+        # a correct result, this value should be modified whenever
+        # "UseDDI" is set to 1.
+        #
+        # default   ""
+        #
+        DDIOffset:              "12345"
+
+
+        # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern
+        # werden lediglich als Teil der Empf�ngernummer mitgeteilt.) Der
+        # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst
+        # werden.
+        #
+        # "DDILength" indicates the number of digits in the extension. (These
+        # numbers are only used as a component of the recipient's number.) The
+        # default value should be adapted whenever DDI is used.
+        #
+        # default   0
+        #
+        DDILength:              3
+
+
+        # Bei "IncomingDDIs" k�nnen in einer durch Komma getrennten Liste alle
+        # Durchwahlziffern (DDIs) angegeben werden, f�r die Rufe angenommen
+        # werden sollen. Eine Bereichsangabe ist auch m�glich (z.B. 100-300),
+        # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind.
+        # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert.
+        #
+        # In "IncomingDDIs", all extension numbers (DDIs) for which calls are
+        # to be accepted may be listed, separated by commas. It is also
+        # possible to specify a range (e.g. 100-300); here no open ranges are
+        # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the
+        # parameters for DDILength will be ignored.
+        #
+        # default   ""
+        #
+        IncomingDDIs:
+
+
+        # Bei "IncomingMSNs" k�nnen in einer durch Komma getrennten Liste alle
+        # MSNs angegeben werden, f�r die Rufe angenommen werden sollen. Ist
+        # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und
+        # eventuell "Sprache" angenommen.
+        # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert.
+        #
+        # In "IncomingMSNs", all MSNs for which calls are to be accepted may
+        # be listed, separated by commas. When the list is empty, all calls
+        # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice".
+        # When "UseDDI" is set to 1, "IncomingMSNs" is ignored.
+        #
+        # default   ""
+        #
+        IncomingMSNs:
+
+
+        # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne
+        # Zielrufnummer (ohne MSN) angenommen.
+        # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer
+        # senden.
+        #
+        # If "AcceptGlobalCall" is set to 1, calls without Called Party
+        # Number also will be accepted.
+        # Needed on internal ports of some PBX.
+        #
+        # default   1
+        #
+        AcceptGlobalCall:   1
+    }
+}
+
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
index 9988299c3..fe39e0b9e 100644
--- a/testing/iproute2/PKGBUILD
+++ b/testing/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 153250 2012-03-12 14:49:33Z ibiru $
+# $Id: PKGBUILD 153934 2012-03-20 20:19:00Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'libnl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -19,13 +19,9 @@ 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://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-	iproute2-fhs.patch
-        fix-ip-l.patch
-        remove-libnl-headers.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73'
-          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
+         iproute2-fhs.patch)
+sha1sums=('25307c2418b9d4c6433d61a296f50b886da84b8c'
+          '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,10 +29,6 @@ build() {
   # set correct fhs structure
   patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
-  #upstream fixes
-  patch -Np1 -i "$srcdir/fix-ip-l.patch"
-  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
-
   ./configure
 
   make
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
index 4589f2e31..6203ac45c 100644
--- a/testing/openssh/PKGBUILD
+++ b/testing/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 153822 2012-03-19 19:12:31Z bisson $
+# $Id: PKGBUILD 153863 2012-03-20 07:01:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=7
+pkgrel=8
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -19,7 +19,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.pam'
         'sshd')
 sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-          '3e8efad4578bbeb8f9788432758c69dc2b303c1c'
+          '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
index 208583238..be2a709fc 100644
--- a/testing/openssh/sshd.close-sessions
+++ b/testing/openssh/sshd.close-sessions
@@ -1,13 +1,16 @@
 # Close sshd sessions before shutting down the network; see FS#17389.
 
 sshd_close_sessions () {
+	if ck_daemon sshd; then
+		return
+	fi
 	/etc/rc.d/sshd stop
 	stat_busy "Stopping Secure Shell Sessions"
 	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe &>/dev/null | grep -q '^/usr/sbin/sshd'; then
-			kill $i &>/dev/null
+		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
+			kill $i
 		fi
-	done
+	done &>/dev/null
 	stat_done
 }
author	root <root@rshg054.dnsready.net>	2012-03-22 00:01:28 +0000
committer	root <root@rshg054.dnsready.net>	2012-03-22 00:01:28 +0000
commit	39e662ccfbe62ae77d458159d192816171a22f43 (patch)
tree	2484a55934cd77dd33597ab2f214de5b7326cf69
parent	a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff)