18 files changed, 121 insertions, 94 deletions
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index cef7b7e78..fe1ad2144 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 142664 2011-11-12 17:45:03Z ibiru $
+# $Id: PKGBUILD 145858 2012-01-03 09:33:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.5
-pkgrel=6
+pkgver=2.5.6
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        avidemux-2.5.4-x264-build115.patch)
-md5sums=('33bbe210c6826cea1987ed18a41d57a7'
-         '24a18b53a58b678b9e87d30566985751')
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
 
 build() {
   cd "${srcdir}/${pkgbase}_${pkgver}"
-
-  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
-
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
@@ -43,7 +39,7 @@ build() {
 
 package_avidemux-cli() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
   optdepends=('lame: for the corresponding audio encoder plugin'
               'faac: for the corresponding audio encoder plugin'
               'faad2: for the corresponding audio decoder plugin'
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index 6ab97891b..5079db709 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125884 2011-05-31 13:01:15Z ibiru $
+# $Id: PKGBUILD 145880 2012-01-03 17:21:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=consolekit
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
@@ -12,14 +12,15 @@ license=('GPL')
 depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
-source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck consolekit.logrotate)
+source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+        pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
 md5sums=('f2657f93761206922d558471a936fbc3'
          'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '6fefa451d9fe2fc6d6269629d3529793')
+         '6fefa451d9fe2fc6d6269629d3529793'
+         '8c5a8059db515d40fae1379daf084094')
 
 build() {
-  cd "${srcdir}/ConsoleKit-${pkgver}"
+  cd "$srcdir/ConsoleKit-$pkgver"
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var \
@@ -31,12 +32,14 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/ConsoleKit-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/"
+  cd "$srcdir/ConsoleKit-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/"
 
   # install the logrotate config
-  install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit
+  install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit"
 
-#  rm -rf "${pkgdir}/var/run"
+  install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf"
+
+  rm -rf "${pkgdir}/var/run"
 }
diff --git a/extra/consolekit/consolekit.tmpfiles.conf b/extra/consolekit/consolekit.tmpfiles.conf
new file mode 100644
index 000000000..4ec125110
--- /dev/null
+++ b/extra/consolekit/consolekit.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/ConsoleKit 0755 - - -
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index b6ceaa864..c3d13e584 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145680 2011-12-27 03:33:44Z bisson $
+# $Id: PKGBUILD 145904 2012-01-03 23:21:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.6.8
+pkgver=2.6.9
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4f8c002fb28ae9342adc9232c6d101270b910395'
+sha1sums=('1de9add43fe1b885b8d143343744016ef0c398fb'
           '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index d9b56afae..ca155f1ef 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 117582 2011-04-04 11:28:21Z ibiru $
+# $Id: PKGBUILD 145870 2012-01-03 14:09:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64)
 license=('GPL')
 depends=('gtk3' 'libgtop' 'dnsutils' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
+makedepends=('gnome-doc-utils' 'intltool')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6b75ee5de54fae67db0ba710e8b334a5b1fcd18719d38ae09b9dd05f5e2555e9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.0/$pkgname-$pkgver.tar.xz)
+sha256sums=('2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper \
       --disable-schemas-compile
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-nettool/gnome-nettool.install b/extra/gnome-nettool/gnome-nettool.install
index 738f7859f..e5dfaf4a5 100644
--- a/extra/gnome-nettool/gnome-nettool.install
+++ b/extra/gnome-nettool/gnome-nettool.install
@@ -1,6 +1,6 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index fdeda3cb4..794aab706 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 141679 2011-11-02 07:51:31Z ibiru $
+# $Id: PKGBUILD 145888 2012-01-03 19:46:57Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
+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)
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
 sha256sums=('73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947')
 
 build() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
+  cd "$srcdir/$_pkgbasename-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var --disable-static \
+      --enable-glade-catalog
   make
 }
 
 package() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index bdf4aab89..6bcb2cc66 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 128655 2011-06-25 11:01:42Z andrea $
+# $Id: PKGBUILD 145872 2012-01-03 14:17:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
 pkgver=1.2.3
 _pkgver=4.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdevplatform' 'kdevelop-pg-qt')
+depends=('kdevelop-pg-qt')
 makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-options=('!makeflags')
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-docs-${pkgver}.tar.bz2")
 sha1sums=('b0dc43cf01d2005f2ad66872ce6b49b093a7ceb4'
@@ -28,10 +27,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release
   make
 
+  # kdevelop-php-docs
   cd "${srcdir}"
   mkdir build-docs
   cd build-docs
-  # kdevelop-php-docs
   cmake ../${pkgname}-docs-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
@@ -42,6 +41,7 @@ package() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 
+  # kdevelop-php-docs
   cd "${srcdir}"/build-docs
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 3b0055d2e..877c469ca 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135608 2011-08-16 16:20:17Z andrea $
+# $Id: PKGBUILD 145874 2012-01-03 14:26:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 8fe07455b..29dcb61fa 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 136744 2011-08-31 22:52:13Z andrea $
+# $Id: PKGBUILD 145876 2012-01-03 14:27:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/libdbusmenu-qt"
 license=('GPL')
 depends=('qt')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen' 'qjson')
 source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('cc6b7b551377e2a07f6fa5afef0d29ff')
 
@@ -19,8 +19,7 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_DOC=OFF
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index a42e33200..a888f813f 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 145175 2011-12-19 00:22:15Z giovanni $
+# $Id: PKGBUILD 145886 2012-01-03 19:05:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('53445217c42736d5932082e5596c20d4')
+md5sums=('d4942dc6427935838e914b8b7b83021a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/polkit-kde/PKGBUILD b/extra/polkit-kde/PKGBUILD
index 087e5593d..0a576e888 100644
--- a/extra/polkit-kde/PKGBUILD
+++ b/extra/polkit-kde/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=polkit-kde
 pkgver=0.99.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon providing a polkit authentication UI for KDE'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1'
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index a6717e077..abced8b9a 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 88089 2010-08-19 13:00:48Z andrea $
+# $Id: PKGBUILD 145862 2012-01-03 12:41:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qimageblitz
 pkgver=0.0.6
-pkgrel=1
-pkgdesc="An interm image effect library"
+pkgrel=2
+pkgdesc="A graphical effect and filter library for KDE"
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/qimageblitz"
+url="http://www.kde.org/"
 license=('GPL2')
 depends=('qt')
-makedepends=('cmake' 'pkgconfig')
+makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5a6c718a56643ffe1f347410bdcca64d')
-options=(!libtool)
+md5sums=('0ae2f7d4e0876764a97ca73799f61df4')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('0ae2f7d4e0876764a97ca73799f61df4')
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index c399bb632..61ca3a799 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id $
+# $Id: PKGBUILD 145864 2012-01-03 12:44:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,7 +14,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz
 md5sums=('5a833ad606c164ed8aa69f0873366ace')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname} \
@@ -24,6 +24,6 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/build"
-    make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 0ca1a910e..f0f567729 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125892 2011-05-31 15:18:06Z stephane $
+# $Id: PKGBUILD 145878 2012-01-03 17:17:44Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="http://www.swig.org/"
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index 3e9865440..a2a2cf8b6 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144370 2011-12-05 12:08:20Z giovanni $
+# $Id: PKGBUILD 145890 2012-01-03 19:57:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64')
@@ -11,17 +11,12 @@ url="http://www.tcpdump.org"
 license=('BSD')
 depends=('libpcap' 'openssl')
 source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
-        'tcpdump_duplicate_executable.patch'
-        'ppi.h')
-md5sums=('0296d4c487c3a156879783643704bd39'
-         'b45c978dff8193ff5529d3566e7dbfa3'
-         'd898c868bb730e14dbd2afd1ad883b87')
+        'tcpdump_duplicate_executable.patch')
+md5sums=('c202878c6db054767b52651041b9e60e'
+         'b45c978dff8193ff5529d3566e7dbfa3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  # Add missing header file
-  cp ${srcdir}/ppi.h .
 
   # do not install tcpdump-4.1.1 executable (FS#23346)
   patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 82a55f4d2..c5e0b99ab 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 142827 2011-11-16 03:17:22Z allan $
+# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.14' 'glibc<2.15' 'perl')
+depends=('glibc>=2.15' 'glibc<2.16' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a855fda56edf05614f099dca316d1775')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+         'f534b79b358cdced0319b375aafde4d5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000..fa400b953
--- /dev/null
+++ b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6422,7 +6433,7 @@
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac