Thu Jul 17 03:55:04 UTC 2014

22 files changed, 205 insertions, 194 deletions

diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index ee83f4efd..91e14a867 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109446 2014-04-14 20:39:09Z seblu $
+# $Id: PKGBUILD 115782 2014-07-16 17:09:52Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
@@ -12,7 +12,7 @@ depends=('readline' 'ncurses')
 source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
-md5sums=('eb7e00b9c1d102ddfcbc19d9cb168511'
+md5sums=('4ec3a9165928a541326ec9de316da974'
          '69221e063a3f07dcad519d5eeacaae75'
          '5b172bd052b523efd95ee018e891e181')
 
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
index 358c6ffec..fb8df0247 100644
--- a/community/docker/PKGBUILD
+++ b/community/docker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 115151 2014-07-05 22:15:37Z seblu $
+# $Id: PKGBUILD 115778 2014-07-16 13:54:27Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -36,10 +36,13 @@ package() {
   install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker"
   install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit"
   # completion
-  install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker"
-  install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker"
+  install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker"
+  install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
   # systemd
-  install -Dm644 "contrib/init/systemd/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
+  install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+  # vim syntax
+  install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
+  install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/dockerfile.vim"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD
index d170fcb3e..491d2141e 100644
--- a/community/elasticsearch/PKGBUILD
+++ b/community/elasticsearch/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 115378 2014-07-09 13:47:21Z mtorromeo $
+# $Id: PKGBUILD 115776 2014-07-16 12:44:51Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('i686' 'x86_64')
 url="http://www.elasticsearch.org/"
 license=('APACHE')
-depends=('java-runtime' 'bash')
+depends=('java-runtime' 'bash' 'systemd')
 install='elasticsearch.install'
 source=(
   "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
   elasticsearch.service
   elasticsearch@.service
+  elasticsearch-user.conf
   elasticsearch-sysctl.conf
   elasticsearch.default
 )
@@ -25,7 +26,7 @@ backup=('etc/elasticsearch/elasticsearch.yml'
         'etc/default/elasticsearch')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir"/$pkgname-$pkgver
 
   for script in plugin elasticsearch; do
     sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
@@ -49,34 +50,36 @@ prepare() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -dm755 "$pkgdir/etc/elasticsearch"
+  cd "$srcdir"/$pkgname-$pkgver
+  install -dm755 "$pkgdir"/etc/elasticsearch
 
   if [ $CARCH = 'x86_64' ]; then
-    install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so"
+    install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir"/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so
   else
-    install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-x86-linux.so"
+    install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir"/usr/lib/elasticsearch/sigar/libsigar-x86-linux.so
   fi
-  cp lib/sigar/sigar*.jar "$pkgdir/usr/lib/elasticsearch/sigar/"
-  cp lib/*.jar "$pkgdir/usr/lib/elasticsearch/"
+  cp lib/sigar/sigar*.jar "$pkgdir"/usr/lib/elasticsearch/sigar/
+  cp lib/*.jar "$pkgdir"/usr/lib/elasticsearch/
 
-  cp config/* "$pkgdir/etc/elasticsearch/"
+  cp config/* "$pkgdir"/etc/elasticsearch/
 
-  install -Dm755 bin/elasticsearch "$pkgdir/usr/bin/elasticsearch"
-  install -Dm755 bin/plugin "$pkgdir/usr/bin/elasticsearch-plugin"
-  install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh"
+  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch
+  install -Dm755 bin/plugin "$pkgdir"/usr/bin/elasticsearch-plugin
+  install -Dm644 bin/elasticsearch.in.sh "$pkgdir"/usr/share/elasticsearch/elasticsearch.in.sh
 
-  install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service"
-  install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service"
+  install -Dm644 "$srcdir"/elasticsearch.service "$pkgdir"/usr/lib/systemd/system/elasticsearch.service
+  install -Dm644 "$srcdir"/elasticsearch@.service "$pkgdir"/usr/lib/systemd/system/elasticsearch@.service
+  install -Dm644 "$srcdir"/elasticsearch-user.conf "$pkgdir"/usr/lib/sysusers.d/elasticsearch.conf
+  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf "$pkgdir"/usr/lib/sysctl.d/elasticsearch.conf
 
-  install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf"
-  install -Dm644 "$srcdir/elasticsearch.default" "$pkgdir/etc/default/elasticsearch"
+  install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
 
-  ln -s ../../../var/lib/elasticsearch "$pkgdir/usr/share/elasticsearch/data"
+  ln -s ../../../var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
 }
 
 sha256sums=('c833d000c7e29e17b4cc5df2e26020c159ee086cdf4ac19f661911cc9aedfbee'
             '4b7c741c2fa2f856cff6b9e83693c2de9d8c00a73812b34133b4446bdcb2e4c8'
             '0c6969af1ab91fc543d4c37fea8f3596872a143281c22a17801703490758ba0a'
+            '51a5ebf06f8853b4b4cbf1b13320dd738a82e9f2caab47ca772f157a6bd78063'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
             'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497')
diff --git a/community/elasticsearch/elasticsearch-user.conf b/community/elasticsearch/elasticsearch-user.conf
new file mode 100644
index 000000000..5a90b850a
--- /dev/null
+++ b/community/elasticsearch/elasticsearch-user.conf
@@ -0,0 +1,3 @@
+u elasticsearch 114 "Elasticsearch user"
+g elasticsearch 114
+m elasticsearch elasticsearch
diff --git a/community/elasticsearch/elasticsearch.install b/community/elasticsearch/elasticsearch.install
index 915acfada..1cf320a95 100644
--- a/community/elasticsearch/elasticsearch.install
+++ b/community/elasticsearch/elasticsearch.install
@@ -1,13 +1,10 @@
 post_install() {
-    getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
-    getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
-
+    systemd-sysusers elasticsearch.conf
     chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
 }
 
 post_upgrade(){
-    getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
-    getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
+    systemd-sysusers elasticsearch.conf
 }
 
 post_remove() {
diff --git a/community/gnuradio-fcdproplus/PKGBUILD b/community/gnuradio-fcdproplus/PKGBUILD
index 2252d83ed..c53206950 100644
--- a/community/gnuradio-fcdproplus/PKGBUILD
+++ b/community/gnuradio-fcdproplus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115628 2014-07-12 19:47:12Z kkeen $
+# $Id: PKGBUILD 115764 2014-07-16 04:52:34Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 pkgname=gnuradio-fcdproplus
 _pkgname=gr-fcdproplus
 pkgver=3.7.4
-pkgrel=3
+pkgrel=4
 _tag=v3.7_hidraw
 pkgdesc="GNU Radio source block for Funcube Dongle Pro +"
 arch=('i686' 'x86_64')
diff --git a/community/gnuradio-iqbal/PKGBUILD b/community/gnuradio-iqbal/PKGBUILD
index 5c0081106..d872117e8 100644
--- a/community/gnuradio-iqbal/PKGBUILD
+++ b/community/gnuradio-iqbal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115693 2014-07-14 09:30:04Z kkeen $
+# $Id: PKGBUILD 115766 2014-07-16 04:59:57Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 pkgname=gnuradio-iqbal
 _pkgname=gr-iqbal
 pkgver=0.37.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Gnuradio I/Q balancing"
 arch=('i686' 'x86_64')
 url="http://cgit.osmocom.org/gr-iqbal/"
diff --git a/community/gnuradio-osmosdr/PKGBUILD b/community/gnuradio-osmosdr/PKGBUILD
index c6bf99419..5b34faae4 100644
--- a/community/gnuradio-osmosdr/PKGBUILD
+++ b/community/gnuradio-osmosdr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115685 2014-07-14 08:50:36Z kkeen $
+# $Id: PKGBUILD 115762 2014-07-16 04:49:30Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com?>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 pkgname=gnuradio-osmosdr
 _pkgname=gr-osmosdr
 pkgver=0.1.1
-pkgrel=9
+pkgrel=10
 #_commit=c65d205d3b
 pkgdesc="Source block for Funcube Dongle, RTL-SDR, USRP, OsmoSDR, BladeRF and HackRF devices"
 url="http://sdr.osmocom.org/trac/"
diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD
index 84e7a847f..cc4f481b4 100644
--- a/community/gnuradio/PKGBUILD
+++ b/community/gnuradio/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 110873 2014-05-08 23:28:53Z kkeen $
+# $Id: PKGBUILD 115760 2014-07-16 04:39:04Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 # Contributor:	Jonatan Sastre <jsastreh [ at ] hotmail.com>
 pkgname=gnuradio
-pkgver=3.7.3
-pkgrel=4
+pkgver=3.7.4
+pkgrel=1
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('i686' 'x86_64')
 url="http://gnuradio.org"
 license=('GPL')
-depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd')
-makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu' 'swig')
-optdepends=('python2-cheetah: gnuradio-companion'
+depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq')
+makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu' 'swig' )
+optdepends=('gnuradio-osmosdr: pile of driver blocks'
+            'python2-cheetah: gnuradio-companion'
             'python2-lxml: gnuradio-companion'
             'pygtk: gnuradio-companion'
             'wxpython: gr-wxgui'
@@ -32,7 +33,6 @@ install=gnuradio.install
 #            'qwtplot3d'
 
 # todo
-# add gr-osmosdr-git to optdepends
 # split the gui components?
 # build doxygen docs?
 # icons
@@ -44,47 +44,47 @@ install=gnuradio.install
 
 source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
         "21-fcd.rules")
-md5sums=('a51e1c2860d6b289233e453d4085514f'
+md5sums=('94e7115ad7b46b5bc9e0b336cf74d8ba'
          '465e12c454c6a22ebec9849181af7bdc')
 
 build() {
-	export PYTHON=python2
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/freedesktop/CMakeLists.txt
-	sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake
-	sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake
-	msg "Starting build."
-	mkdir -p build
-	cd build
-	cmake \
-		-DPYTHON_EXECUTABLE=$(which python2) \
-		-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-		-DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-		-DENABLE_GRC=ON \
-		-DENABLE_GR_WXGUI=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
-	make
+  export PYTHON=python2
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/freedesktop/CMakeLists.txt
+  sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake
+  sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake
+  msg "Starting build."
+  mkdir -p build
+  cd build
+  cmake \
+    -DPYTHON_EXECUTABLE=$(which python2) \
+    -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
+    -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
+    -DENABLE_GRC=ON \
+    -DENABLE_GR_WXGUI=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
+  make
 }
 
 check() {
-	cd "$srcdir/$pkgname-$pkgver/build"
-	export PYTHON=python2
-	#make test
+  cd "$srcdir/$pkgname-$pkgver/build"
+  export PYTHON=python2
+  #make test
 }
 
 package() {
-	cd "$srcdir"
-	install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
-	cd "$srcdir/$pkgname-$pkgver/grc/freedesktop"
-        install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-	cd "$srcdir/$pkgname-$pkgver/build"
-	make DESTDIR="$pkgdir" install
-	msg "Replacing filenames to use python2."
-	sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-		$(find "$pkgdir" -name '*.py') \
-		$(find "$pkgdir" -name 'gnuradio-companion' -o -name 'flow_graph.tmpl')
-	find "$pkgdir/" -name '*.pyc' -delete
-	find "$pkgdir/" -name '*.pyo' -delete
+  cd "$srcdir"
+  install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
+  cd "$srcdir/$pkgname-$pkgver/grc/freedesktop"
+  install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  cd "$srcdir/$pkgname-$pkgver/build"
+  make DESTDIR="$pkgdir" install
+  msg "Replacing filenames to use python2."
+  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find "$pkgdir" -name '*.py') \
+    $(find "$pkgdir" -name 'gnuradio-companion' -o -name 'flow_graph.tmpl')
+  find "$pkgdir/" -name '*.pyc' -delete
+  find "$pkgdir/" -name '*.pyo' -delete
 }
 
 # options for armv6:
diff --git a/community/gqrx/PKGBUILD b/community/gqrx/PKGBUILD
index 11f84a1dd..a5f78467d 100644
--- a/community/gqrx/PKGBUILD
+++ b/community/gqrx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115635 2014-07-12 22:23:39Z kkeen $
+# $Id: PKGBUILD 115768 2014-07-16 05:03:43Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 
 pkgname=gqrx
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive SDR receiver waterfall for many devices."
 arch=('i686' 'x86_64')
 url="http://gqrx.dk/"
@@ -20,8 +20,8 @@ md5sums=('ff771b9c31ee17f704859398362b8cc0'
 
 prepare() {
   cd "$srcdir"
-  cp -r gqrx-2.2.0 gqrx-2.2.0-alsa
-  cd gqrx-2.2.0-alsa
+  cp -r gqrx-$pkgver gqrx-$pkgver-alsa
+  cd gqrx-$pkgver-alsa
   sed -i 's/AUDIO_BACKEND = pulse/#&/' gqrx.pro
 }
 
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index 70de00d90..804ee42d8 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 114780 2014-07-04 03:59:18Z fyan $
+# $Id: PKGBUILD 115754 2014-07-16 03:16:08Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: namelessjon <jonathan.stott@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=libsodium
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,8 @@ url="https://github.com/jedisct1/libsodium"
 license=('custom:ISC')
 depends=('glibc')
 makedepends=('clang')
-source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
+source=("http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz")
+sha512sums=('80524d4017ccd98f5aa96d7df1d4450c890f5c1aaee9c2bfc277fab98f4fb01ac2a3f11850e4f6610feea0279d707e1dede70991d252beeaf80bde3b6eff8ff3')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -38,4 +39,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('3a47468d3db1447fcb223de330ee3ffd11394ecd31440bfd2d89999003bdf01f85c0644b6075d73d670bf94ab9ea2162417a0dcd290ad2a9a46ae76cd467fc85')
diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD
index d51796f9e..a95746f97 100644
--- a/community/libuhd/PKGBUILD
+++ b/community/libuhd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105585 2014-02-10 16:15:17Z kkeen $
+# $Id: PKGBUILD 115758 2014-07-16 03:56:10Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 
 pkgname=libuhd
-pkgver=3.6.2
-_verstring=003_006_002
+pkgver=3.7.1
+_verstring=003_007_001
 pkgrel=1
 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@ optdepends=('python2: usrp utils')
 makedepends=('cmake' 'boost' 'python2-cheetah')
 
 source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/release_${_verstring}.tar.gz")
-md5sums=('50a25b95dc08dd3946988c5da98814a9')
+md5sums=('0f53757cc5452ceb53baab88471a6043')
 
 build() {
   cd "$srcdir/uhd-release_$_verstring/host"
@@ -30,8 +30,6 @@ build() {
            -DENABLE_UTILS=ON \
            -DENABLE_TESTS=OFF \
            -DENABLE_E100=ON
-  # e100 is disabled by default for now, check that on future releases
-
   make
 }
 
@@ -45,3 +43,4 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
 } 
+
diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD
index f2dcce3ac..ce58d7d1c 100644
--- a/community/scratch/PKGBUILD
+++ b/community/scratch/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 110539 2014-05-02 20:59:25Z jsteel $
+# $Id: PKGBUILD 115784 2014-07-16 18:25:22Z jsteel $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Muhammed Uluyol <muhammedu@gmail.com>
 
 pkgname=scratch
 pkgver=1.4.0.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Create and share your own interactive stories, games, music and art"
 arch=('i686' 'x86_64')
 url="http://scratch.mit.edu"
 license=('GPL2')
-install=$pkgname.install
 depends=('squeak-vm' 'shared-mime-info' 'desktop-file-utils' 'pango'
          'gtk-update-icon-cache')
+backup=('usr/lib/scratch/Scratch.ini')
+install=$pkgname.install
 source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz)
 md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a')
 
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver.src
+
+  # Fix FS#41125
+  sed -i 's/-xshm //' src/$pkgname
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver.src
 
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index d09467180..ba0b2fbc8 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@ depends=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvor
          'libgl' 'glu')
 makedepends=('mesa')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('473c151ff44e3db7b603ecacd800a0d2')
+md5sums=('be91bf3fa2f1b44a82c92cfe8c5cc1c8')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 28ab56c32..4d672a734 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 115351 2014-07-09 09:08:38Z fyan $
+# $Id: PKGBUILD 115792 2014-07-16 21:39:39Z seblu $
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.3.12
-pkgrel=3
+pkgver=4.3.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 030cc37fc..6aa886916 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 114746 2014-07-03 16:16:44Z tpowa $
+# $Id: PKGBUILD 115790 2014-07-16 21:19:11Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.3.12
-pkgrel=6
+pkgver=4.3.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD
index 0ed2f9049..04430dc81 100644
--- a/core/diffutils/PKGBUILD
+++ b/core/diffutils/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 180850 2013-03-27 01:10:49Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216930 2014-07-16 17:04:50Z seblu $
+# Mainainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=diffutils
 pkgver=3.3
-pkgrel=1
-pkgdesc="Utility programs used for creating patch files"
+pkgrel=2
+pkgdesc='Utility programs used for creating patch files'
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/diffutils"
+url='http://www.gnu.org/software/diffutils'
 license=('GPL3')
 groups=('base')
-depends=('glibc' 'sh')
+depends=('glibc' 'bash')
 install=diffutils.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
 md5sums=('99180208ec2a82ce71f55b0d7389f1b3'
          '203a2f2101dfcc09cdac655be353fd78')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index 5d7b9f06a..5d352ba5a 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216931 2014-07-16 17:04:51Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=patch
 pkgver=2.7.1
-pkgrel=2
-pkgdesc="A utility to apply patch files to original sources"
+pkgrel=3
+pkgdesc='A utility to apply patch files to original sources'
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html"
+url='http://www.gnu.org/software/patch/patch.html'
 license=('GPL')
 groups=('base-devel')
-depends=('glibc')
+depends=('glibc' 'attr')
 makedepends=('ed')
 optdepends=('ed: for patch -e functionality')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        patch-2.7.1-initialize-data-structures-early-enough.patch)
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+        'patch-2.7.1-initialize-data-structures-early-enough.patch')
 md5sums=('e9ae5393426d3ad783a300a338c09b72'
-         'b12189e0de3cb2af25268441647ec517'
+         'SKIP'
          'dc6367a7cd49933d4006c246789e98da')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+prepare() {
   # Fix segfault on non-numeric strip-count
   # (also segfaults on nonexistent directory passed to -d)
   # http://savannah.gnu.org/bugs/?37500
-  patch -Np1 -i \
-    $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch
+  patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch
+}
 
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/patch/patch-2.6.1-get-arg.patch b/core/patch/patch-2.6.1-get-arg.patch
deleted file mode 100644
index 45f3bc8a5..000000000
--- a/core/patch/patch-2.6.1-get-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg	2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c	2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
-   {"remove-empty-files", no_argument, NULL, 'E'},
-   {"force", no_argument, NULL, 'f'},
-   {"fuzz", required_argument, NULL, 'F'},
--  {"get", no_argument, NULL, 'g'},
-+  {"get", required_argument, NULL, 'g'},
-   {"input", required_argument, NULL, 'i'},
-   {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD
index 481f51316..64f240be0 100644
--- a/core/which/PKGBUILD
+++ b/core/which/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 176251 2013-01-28 00:29:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216932 2014-07-16 17:04:52Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=which
 pkgver=2.20
-pkgrel=6
-pkgdesc="A utility to show the full path of commands"
+pkgrel=7
+pkgdesc='A utility to show the full path of commands'
 arch=('i686' 'x86_64')
-url="http://www.xs4all.nl/~carlo17/which"
+url='http://savannah.gnu.org/projects/which'
 license=('GPL3')
 groups=('base' 'base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'bash')
 install=which.install
-source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('95be0501a466e515422cde4af46b2744')
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('95be0501a466e515422cde4af46b2744'
+         'SKIP')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/which/which.install b/core/which/which.install
index 167e2506e..fdc5accba 100644
--- a/core/which/which.install
+++ b/core/which/which.install
@@ -2,19 +2,19 @@ infodir=/usr/share/info
 filelist=(which.info)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2>/dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null
   done
 }
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 9567ab032..30a2ccdf9 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216747 2014-07-09 15:41:00Z guillaume $
+# $Id: PKGBUILD 216927 2014-07-16 12:41:52Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,10 +6,10 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.5.0
+_icedtea_ver=2.5.1
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=60
+_JDK_UPDATE_VERSION=65
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -25,15 +25,15 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'eclipse-ecj')
 
 _icedtea_url=http://icedtea.classpath.org/download
-_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver:0:3}
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
 source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_drops_url}/openjdk.tar.bz2
-        ${_drops_url}/corba.tar.bz2
-        ${_drops_url}/jaxp.tar.bz2
-        ${_drops_url}/jaxws.tar.bz2
-        ${_drops_url}/jdk.tar.bz2
-        ${_drops_url}/langtools.tar.bz2
-        ${_drops_url}/hotspot.tar.bz2
+        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
+        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
+        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
+        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
+        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
+        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
+        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
         giflib_5.1.diff
@@ -42,14 +42,14 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
 
-sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
-            '9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859'
-            '1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253'
-            '59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488'
-            'ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028'
-            '508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83'
-            '0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659'
-            '645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26'
+sha256sums=('06483c252099d41e33eade8ceee9231a15ba1e9594f90e2d32943d17c8802acd'
+            '0496072760c521aa184f3c26c1f515a89ef6f9a88df14fa888c6ee6cdd9379b7'
+            'd476f22db32e028cc30dda47fec81e5ba0e113f029c3ed7a30edf8fc1404819b'
+            'd13778e5bbf6cda22a40b9d5186d2a7d1a3f34d998b1ac4d65fe3abd12fffa25'
+            '29c39856af1153620023c3fa0313be2f23dc02208db1a8429ca80d1eebfce06f'
+            '76194344fca5db4c79e4a2af28efd9fbb2e38e879b5afc59042874519bb5f7fc'
+            '374174ea3b7eb2bb81d9dfae4749d7b3c9037d07004aa59aaa5e8ed5fba922d3'
+            '78d57f7c207d8f56bba2ee6aec232a836fd51830d352cfa4804d8077d9a7b32b'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9'
@@ -58,13 +58,13 @@ sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
             '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
-noextract=(openjdk.tar.gz
-           corba.tar.gz
-           jaxp.tar.gz
-           jaxws.tar.gz
-           jdk.tar.gz
-           langtools.tar.gz
-           hotspot.tar.gz)
+noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
+           icedtea_${_icedtea_ver}_corba.tar.bz2
+           icedtea_${_icedtea_ver}_jaxp.tar.bz2
+           icedtea_${_icedtea_ver}_jaxws.tar.bz2
+           icedtea_${_icedtea_ver}_jdk.tar.bz2
+           icedtea_${_icedtea_ver}_lanbtools.tar.bz2
+           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
 
 [ "$CARCH" = "x86_64" ] && _JARCH=amd64
 [ "$CARCH" = "i686" ]   && _JARCH=i386
@@ -102,13 +102,13 @@ build() {
         --disable-downloading --disable-Werror \
         --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip="${srcdir}/openjdk.tar.bz2" \
-        --with-hotspot-src-zip="${srcdir}/hotspot.tar.bz2" \
-        --with-corba-src-zip="${srcdir}/corba.tar.bz2" \
-        --with-jaxp-src-zip="${srcdir}/jaxp.tar.bz2" \
-        --with-jaxws-src-zip="${srcdir}/jaxws.tar.bz2" \
-        --with-jdk-src-zip="${srcdir}/jdk.tar.bz2" \
-        --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \
+        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
+        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
+        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
+        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
+        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
+        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
+        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir} \