Sat Jun 30 00:01:49 UTC 2012

23 files changed, 154 insertions, 138 deletions

diff --git a/community-testing/python2-matplotlib/PKGBUILD b/community-testing/python2-matplotlib/PKGBUILD
index d58a76d36..2f96cd33e 100644
--- a/community-testing/python2-matplotlib/PKGBUILD
+++ b/community-testing/python2-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73015 2012-06-27 23:42:45Z stephane $
+# $Id: PKGBUILD 73023 2012-06-28 11:16:15Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,12 +6,13 @@
 
 pkgname=python2-matplotlib
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url="http://matplotlib.sourceforge.net/"
+license=('custom')
 backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
+depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
 optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'wxpython: for use with the WXAgg backend')
@@ -22,8 +23,7 @@ conflicts=('python-matplotlib')
 source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz"
          setup.cfg)
 sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae'
-          'bcb5a83db9d95c96a57ca518fa6bd1897b23558f')
-license=('custom')
+          'f074495fc965298e0372751b34c8edb319437c5f')
 
 build() {
    cd "${srcdir}/matplotlib-${pkgver}"
@@ -34,6 +34,9 @@ build() {
    rm lib/matplotlib/pyparsing.py
    sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py
 
+   # remove internal copy of dateutil
+   rm -r lib/dateutil
+
    # python2 fix
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
diff --git a/community-testing/python2-matplotlib/setup.cfg b/community-testing/python2-matplotlib/setup.cfg
index 4b82986e9..778b04ccc 100644
--- a/community-testing/python2-matplotlib/setup.cfg
+++ b/community-testing/python2-matplotlib/setup.cfg
@@ -28,7 +28,7 @@ tag_svn_revision = 1
 #
 ## Date/timezone support:
 #pytz = False
-#dateutil = False
+dateutil = False
 
 [gui_support]
 # Matplotlib supports multiple GUI toolkits, including Cocoa,
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index b44f8cf38..a8e7f2941 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71747 2012-06-02 10:29:22Z bluewind $
+# $Id: PKGBUILD 73035 2012-06-28 19:07:34Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=linux-tools
-pkgname=('perf' 'cpupower')
+pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -41,10 +41,16 @@ build() {
   popd
 
   msg2 'Build cpupower'
-  cd linux-$pkgver/tools/power/cpupower
+  pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
+  popd
+
+  msg2 'Build x86_energy_perf_policy'
+  pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  make
+  popd
 }
 
 package_perf() {
@@ -80,4 +86,12 @@ package_cpupower() {
   install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
 }
 
+package_x86_energy_perf_policy() {
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+
+  cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD
index 32fdfe63f..4676e046a 100644
--- a/community/mesa-dri1/PKGBUILD
+++ b/community/mesa-dri1/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mesa-dri1
 pkgname=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
 
 pkgver=7.11.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index d25c3a9d8..5ae8204b7 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72134 2012-06-09 00:04:05Z heftig $
+# $Id: PKGBUILD 73033 2012-06-28 18:43:36Z cbrannon $
 # Maintainer: Chris Brannon <chris@the-brannons.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
 arch=('i686' 'x86_64')
 url="http://www.remlab.net/ndisc6/"
@@ -14,10 +14,12 @@ options=(!emptydirs)
 install=ndisc6.install
 source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2
         rdnssd.rc.d
-	rdnssd.confd)
+	rdnssd.confd
+	rdnssd.service)
 md5sums=('50cb4c19606cf6ff2b7388e71832f579'
          '3421fd731c4da4f9e07fc6b6ff4e5084'
-         'f1910902932e2622fc166960819db6c4')
+         'f1910902932e2622fc166960819db6c4'
+         'beeb4f033e9eb951e2de962f609c7c2a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -32,6 +34,8 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd"
   install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd"
+  install -Dm644 "$srcdir/rdnssd.service" \
+    "$pkgdir/usr/lib/systemd/system/rdnssd.service"
 
   install -d "$pkgdir/usr/lib/tmpfiles.d"
   echo "d /run/rdnssd 0755 nobody root" > "$pkgdir/usr/lib/tmpfiles.d/ndisc6.conf"
diff --git a/community/ndisc6/rdnssd.service b/community/ndisc6/rdnssd.service
new file mode 100644
index 000000000..dcaf73331
--- /dev/null
+++ b/community/ndisc6/rdnssd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RDNSS daemon for Linux
+Before=network.target
+Requires=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/rdnssd.pid
+ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
index 778908a3c..9e350af3c 100644
--- a/community/python2-basemap/PKGBUILD
+++ b/community/python2-basemap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71122 2012-05-24 14:57:31Z stephane $
+# $Id: PKGBUILD 73031 2012-06-28 18:07:29Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Julien Morin <jmorin@cp.dias.ie>
 
 pkgname=python2-basemap
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="Toolkit for plotting data on map projections"
 arch=('i686' 'x86_64')
@@ -12,13 +12,13 @@ license=('custom')
 depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2')
 optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
 source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
-sha1sums=('ee5913726d31a76a5c40451dd248977355ea3cff')
+sha1sums=('b6d312129d2ae7fb612490516cf87daaf18cb033')
 
 build() {
    cd "${srcdir}/basemap-${pkgver}"
 
    # Remove the bundled librarie
-   rm -r geos-?.?.?
+   rm -r geos-*
 
    sed -i "s/lib64/lib/g" setup.py
 
diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD
index 6dbdfcbee..51953da90 100644
--- a/community/python2-pyopencl/PKGBUILD
+++ b/community/python2-pyopencl/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 65311 2012-02-20 22:07:36Z stephane $
+# $Id: PKGBUILD 73025 2012-06-28 12:23:14Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=python2-pyopencl
-pkgver=2011.2
+pkgver=2012.1
 pkgrel=1
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
-depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa')
+depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa' 'boost')
 makedepends=('ctags' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
         'LICENSE.txt')
-sha1sums=('6db28dcb896c9fef7c1c361f69ebfb96050d2977'
+sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
           '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
 
 build() {
    cd "${srcdir}/pyopencl-${pkgver}"
-   python2 ./configure.py --cl-enable-gl
+   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost
 
    python2 setup.py build
 }
diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD
index c0cc40796..1e863a55a 100644
--- a/core/mlocate/PKGBUILD
+++ b/core/mlocate/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 152305 2012-03-06 15:10:37Z allan $
+# $Id: PKGBUILD 162719 2012-06-29 02:14:10Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: lydgate
 
 pkgname=mlocate
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
 arch=('i686' 'x86_64')
 url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
 license=('GPL')
-conflicts=('slocate')
-provides=('slocate')
-replaces=('slocate')
 depends=('glibc' 'coreutils' 'sh')
 backup=('etc/updatedb.conf'
         'etc/cron.daily/updatedb')
-install=mlocate.install
 source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
 	updatedb.conf
 	updatedb.cron.daily)
 md5sums=('c6d043b170613b0e327a815b497f680a'
-         'c374ff223f2e07b5e602ba22359f2335'
+         'b56d81de17fe29b01b4b28861acb8fd4'
          'cde5da81bebad2de556ef2e43d895e13')
 
 build() {
@@ -39,18 +35,17 @@ check() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  
-  # Set up a default updatedb.conf and a daily cronjob
-  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
-  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
 
-  # Install Mlocate
   make DESTDIR=$pkgdir install
 
-  ln -sv locate $pkgdir/usr/bin/slocate
-  chgrp -v 21 $pkgdir/usr/bin/locate
-  chmod -v 2755 $pkgdir/usr/bin/locate
+  ln -s locate $pkgdir/usr/bin/slocate
+  chgrp 21 $pkgdir/usr/bin/locate
+  chmod 2755 $pkgdir/usr/bin/locate
 
   install -dm755 $pkgdir/var/lib
-  install -d -m750 -g21 $pkgdir/var/lib/locate
+  install -dm750 -g21 $pkgdir/var/lib/locate
+  
+  # Set up a default updatedb.conf and a daily cronjob
+  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
+  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
 }
diff --git a/core/mlocate/updatedb.conf b/core/mlocate/updatedb.conf
index 722b04205..633c17482 100644
--- a/core/mlocate/updatedb.conf
+++ b/core/mlocate/updatedb.conf
@@ -1,5 +1,4 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf"
+PRUNE_BIND_MOUNTS = "yes"
+PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf"
+PRUNENAMES = ".git .hg .svn"
+PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache /var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp"
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 4d8ed4bb0..30462893c 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159402 2012-05-23 20:09:18Z tomegun $
+# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
-pkgver=3.1.9
-pkgrel=2
+pkgver=3.1.10
+pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -11,7 +11,7 @@ url="http://mj.ucw.cz/sw/pciutils/"
 depends=('glibc' 'hwids')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e958f5ffb93b12972964381c38f27eb3')
+md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,5 +26,5 @@ package() {
   make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
   # this is now supplied by the hwids package
-  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
 }
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 1fc579a12..d51bb8a57 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153456 2012-03-14 17:16:21Z eric $
+# $Id: PKGBUILD 162721 2012-06-29 02:41:45Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2)
-sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8')
+sha1sums=('366a10f3bd71c4d84c29437fff1e27a8560f691b')
 
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD
index b1ec2b92b..425ac426b 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 135705 2011-08-17 16:07:55Z tpowa $
+# $Id: PKGBUILD 162692 2012-06-28 10:33:24Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lensfun
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
 url="http://lensfun.berlios.de/"
 license=('LGPL3')
 depends=('glibc' 'glib2')
-makedepends=('python' 'libpng' 'doxygen')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "runtime.cpu.detection.fix.backport.patch")
+makedepends=('python2' 'libpng' 'doxygen')
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
-    patch -p0 -i "${srcdir}/runtime.cpu.detection.fix.backport.patch"
     ./configure \
         --prefix=/usr \
         --libdir=/usr/lib
@@ -27,6 +25,4 @@ package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make INSTALL_PREFIX="$pkgdir" install
 }
-
-md5sums=('a10438dffae68a5988fc54b0393a3755'
-         'a2033928f263db319de78182ab12fb7d')
+md5sums=('740e4749db04da0a597630dd6339b966')
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
index 63cfbf7c6..c21c99615 100644
--- a/extra/misdnuser/PKGBUILD
+++ b/extra/misdnuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159456 2012-05-24 13:58:07Z tpowa $
+# $Id: PKGBUILD 162698 2012-06-28 13:43:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=misdnuser
-pkgver=2.0.13_20120524
+pkgver=2.0.13_20120607
 pkgrel=1
 pkgdesc="Tools and library for mISDN"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ build() {
   #export CFLAGS+=" -g -O0"
   #export CXXFLAGS+=" -g -O0"
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-capi --enable-softdsp --with-mISDN_group=uucp
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
   make
 }
 
@@ -33,14 +33,11 @@ package() {
   mkdir -p ${pkgdir}/usr/lib/udev/rules.d
   mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d
   rm -r ${pkgdir}/etc/udev/
-  # remove temporary dir /var/run/mISDNcapid
-  rm -r ${pkgdir}/var
   # add systemd files
   install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
   install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
 }
-
-md5sums=('d9b400e9888042e75c14fb3a8c2885cb'
+md5sums=('10b370c2010c9239161095e5d2a1cb3f'
          '2009563b144de037ecb20f8d727a772e'
          '638b399f7e0937639960c4dfb3d5138e'
          '42c3b46880a68c3883ee1ed00af34b45')
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 5807ad4a0..51d8cb634 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158856 2012-05-12 13:09:28Z andyrtr $
+# $Id: PKGBUILD 162703 2012-06-28 17:12:56Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.13
+pkgver=3.5.0.14
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
@@ -14,7 +14,7 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
         nx-x11.ld.so.conf.d)
-md5sums=('2c80e570d35a25989f8606e1f3620026'
+md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
          'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {
diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD
index 9f418eaed..46bcfd05a 100644
--- a/kde-unstable/kdebindings-python/PKGBUILD
+++ b/kde-unstable/kdebindings-python/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 162556 2012-06-27 12:58:08Z andrea $
+# $Id: PKGBUILD 162688 2012-06-28 07:00:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
 pkgver=4.8.95
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
 source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
 sha1sums=('e0b674d266f679d9dc36b28bff46767cba97f280')
 
@@ -23,6 +24,7 @@ build() {
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python \
     -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
   make
   cd ..
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index d8ce703b2..aa7dea706 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.12.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -16,7 +16,7 @@ depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
 	 'net-snmp>=5.7.1')
 makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
 optdepends=('cups: for printing support'
-            'dbus-python: for dbus support'
+            'python2-dbus: for dbus support'
             'sane: for scanner support'
             'python-imaging: for commandline scanning support'
             'python-notify: for Desktop notification support'
@@ -36,16 +36,16 @@ md5sums=('5303938e8630775ea6fb383af85775e5'
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
  export PYTHON=python2
-
+ 
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
+ 
 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
@@ -57,7 +57,7 @@ build() {
 			gzip > ${i}.temp || return 1
 		mv ${i}.temp ${i}
 	done
-
+   
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 8a407aee3..a54e9d948 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -15,7 +15,7 @@ _pgo=false
 # We're getting this from Debian Sid
 _debname=iceweasel
 _debver=13.0.1
-_debrel=1
+_debrel=2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -52,7 +52,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('9eb7668e4a5b5be63ccf4d43c212d011'
-         'f3ac4e2f52965335ccf13588255e6db4'
+         'c5eb6357cecd0d83e75ef37a9dcf3683'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 083cce961..def346093 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -28,9 +28,9 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '20870541e88109d2f153be3c58a277f1')
 
 build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
+  # apply stable patching set
   if [ "${_basekernel}" != "${pkgver}" ]; then
+    msg2 'Applying stable patch set'
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
index 40f46a48b..d733500ed 100644
--- a/testing/dbus-core/PKGBUILD
+++ b/testing/dbus-core/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 162320 2012-06-25 01:19:03Z dreisner $
+# $Id: PKGBUILD 162700 2012-06-28 14:06:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.6.0
-pkgrel=5
+pkgver=1.6.2
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
         dbus)
-md5sums=('16dcae2dd0c76e398381601ac9acdec4'
-         '0ebde9920bde83fe26ce32351a7d8954'
+md5sums=('7fbf877ed6ff7da6df90f07158373829'
+         '2cd74b6efca77e4e3aa2b7ccde770668'
          'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
-  cd "${srcdir}/dbus-${pkgver}"
+  cd dbus-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
       --with-system-pid-file=/run/dbus/pid \
       --with-system-socket=/run/dbus/system_bus_socket \
+      --with-console-auth-dir=/run/console/ \
       --enable-inotify --disable-dnotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
@@ -35,19 +35,19 @@ build() {
 }
 
 package(){
-  cd "${srcdir}/dbus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd dbus-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  rm -f "${pkgdir}/usr/bin/dbus-launch"
-  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
-  rm -rf "${pkgdir}/var/run"
+  rm -f "$pkgdir/usr/bin/dbus-launch"
+  rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
+  rm -rf "$pkgdir/var/run"
 
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
+  install -m755 -d "$pkgdir/etc/rc.d"
+  install -m755 ../dbus "$pkgdir/etc/rc.d/"
 
   #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
+  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf"
 
-  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
+  install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
 }
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
index 393cfd99c..05f8856a8 100644
--- a/testing/dbus/PKGBUILD
+++ b/testing/dbus/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 161482 2012-06-11 19:40:12Z andyrtr $
+# $Id: PKGBUILD 162696 2012-06-28 11:58:24Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.0
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=("dbus-core>=${pkgver}" 'libx11')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+depends=("dbus-core>=$pkgver" 'libx11')
+source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
         30-dbus)
-md5sums=('16dcae2dd0c76e398381601ac9acdec4'
-         '0ebde9920bde83fe26ce32351a7d8954'
+md5sums=('7fbf877ed6ff7da6df90f07158373829'
+         '2cd74b6efca77e4e3aa2b7ccde770668'
          '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
       --with-system-pid-file=/var/run/dbus.pid \
@@ -28,15 +28,15 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m755 tools/dbus-launch "${pkgdir}/usr/bin/"
-  install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
+  cd $pkgname-$pkgver
+  install -m755 -d "$pkgdir/usr/bin"
+  install -m755 -d "$pkgdir/usr/share/man/man1"
+  install -m755 tools/dbus-launch "$pkgdir/usr/bin/"
+  install -m644 doc/dbus-launch.1 "$pkgdir/usr/share/man/man1/"
 
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+  install -m755 -d "$pkgdir/etc/X11/xinit/xinitrc.d"
+  install -m755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/"
+  install -d -m755 "$pkgdir/usr/share/licenses/dbus"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus/"
 }
diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD
index e71668459..3ebee8465 100644
--- a/testing/libusbx/PKGBUILD
+++ b/testing/libusbx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162126 2012-06-21 06:54:30Z tpowa $
+# $Id: PKGBUILD 162718 2012-06-28 20:58:52Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libusbx
 pkgver=1.0.12
-pkgrel=1
+pkgrel=2
 depends=('glibc')
 pkgdesc="Library that provides generic access to USB device"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ md5sums=('c41352ac755c7992edfcbb2ea4ad1349')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr 
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
index 35c1bcffc..4383cd418 100644
--- a/testing/pyqt/PKGBUILD
+++ b/testing/pyqt/PKGBUILD
@@ -1,27 +1,21 @@
-# $Id: PKGBUILD 162684 2012-06-27 22:06:41Z andrea $
+# $Id: PKGBUILD 162690 2012-06-28 07:30:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.3
-pkgrel=3
+pkgver=4.9.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        'fix-qthelp-build.patch')
-md5sums=('223f75c55f1c38c46bd164cdd4996a43'
-         '6acfe0a5a00779f946c29d5fac647ce1')
+             source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('a0b6a820633366365af5124ddbd059c7')
 
 build() {
-  # Build QtHelp (FS#27665)
-  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
-
   cd "${srcdir}"
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}