Sun Jun 8 03:32:09 UTC 2014

26 files changed, 212 insertions, 189 deletions

diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index 9187b0b50..58074573e 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102230 2013-12-07 00:44:42Z seblu $
+# $Id: PKGBUILD 112775 2014-06-06 17:28:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=13
+pkgrel=14
 pkgdesc='Ethernet/FDDI station activity monitor'
 arch=('i686' 'x86_64')
 url='ftp://ftp.ee.lbl.gov/'
@@ -28,6 +28,8 @@ prepare() {
   sed -i 's/-\(o\|g\) bin/-\1 root/g' Makefile.in
   # Update ethercodes with recent OUI. See gen_ethercodes.sh
   cp -f "$srcdir/ethercodes.dat" ethercodes.dat
+  # Do not spam root user
+  sed -i 's|root|arpwatch|' addresses.h.in
 }
 
 build() {
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
index df6c1daed..04f92258c 100644
--- a/community/docker/PKGBUILD
+++ b/community/docker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110875 2014-05-09 01:01:46Z seblu $
+# $Id: PKGBUILD 112806 2014-06-07 15:37:23Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=0.11.1
+pkgver=0.12.0
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD
index 0fd7ebeab..1f4451a3a 100644
--- a/community/ffms2/PKGBUILD
+++ b/community/ffms2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 112694 2014-06-05 07:22:40Z alucryd $$
+# $Id: PKGBUILD 112748 2014-06-06 08:12:32Z alucryd $$
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ffms2
-pkgver=2.19.1
+pkgver=2.19.1.r120.9203af5
 pkgrel=1
 pkgdesc='A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access'
 arch=('i686' 'x86_64')
@@ -11,18 +11,18 @@ license=('GPL')
 depends=('ffmpeg')
 makedepends=('git')
 provides=('vapoursynth-plugin-ffms2')
-source=("https://github.com/FFMS/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('39c8a5f6c6735d10b3b0a3830f71ef0182b42e747cbceb6bf9b8dcc0532c99db')
+source=("git+https://github.com/FFMS/ffms2.git#commit=9203af5")
+sha256sums=('SKIP')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
 
-  ./configure --prefix='/usr' --enable-shared --disable-static --enable-avresample
+  ./autogen.sh --prefix='/usr' --enable-shared --disable-static --enable-avresample
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 5624eb1f0..ddba9d261 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112601 2014-06-04 13:50:54Z bluewind $
+# $Id: PKGBUILD 112750 2014-06-06 09:24:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 
 pkgname=freeradius
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64')
 url="http://www.freeradius.org/"
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index bbc691e92..1d34b526f 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('gdc' 'libgphobos-devel')
 pkgver=4.9.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 15d861a92..35c85a962 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 112599 2014-06-04 12:04:55Z spupykin $
+# $Id: PKGBUILD 112752 2014-06-06 09:24:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
-pkgver=2.1
-pkgrel=3
+pkgver=2.2
+pkgrel=1
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64')
 url="http://w1.fi/hostapd/"
@@ -14,7 +14,7 @@ options=(emptydirs)
 source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	config
 	hostapd.service)
-md5sums=('bb9c50e87c5af6f89f387e63911effac'
+md5sums=('23c1f78a693c3288802d516adb7fd289'
          'eab3ae853869f832965f59898bb04a52'
          'a0a16879eed5e4e41ae6b225a4809955')
 
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index 804a3d6c9..fc4bb5fbd 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112678 2014-06-04 19:29:23Z jsteel $
+# $Id: PKGBUILD 112769 2014-06-06 16:50:29Z jsteel $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: megadriver <megadriver at gmx dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -7,7 +7,7 @@
 # Contributor: Hans-Kristian Arntzen <maister@archlinux.us>
 
 pkgname=mednafen
-pkgver=0.9.35
+pkgver=0.9.35.1
 pkgrel=1
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net"
@@ -18,7 +18,7 @@ makedepends=('mesa' 'glu')
 replaces=('mednafen-wip')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2)
-md5sums=('028b5df171872658325e96913166c754')
+md5sums=('99353ecbdd4ec4dd906aa7246f72cf51')
 
 build() {
   cd "$srcdir"/$pkgname
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 923a09716..684110970 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106753 2014-03-07 09:09:10Z spupykin $
+# $Id: PKGBUILD 112754 2014-06-06 09:25:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Kamil Kaminski <kyle@kkaminsk.com>
 
 pkgname=minidlna
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ changelog=changelog
 source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz
 	minidlna.service
 	minidlna.tmpfiles)
-md5sums=('65cebffaf9b57bf30fbfcf2a3a3253e6'
+md5sums=('879027192c89e5376cdd2ae2d1aa33b4'
          '7e3890ee50aa4dfa4d1754261e6cc965'
          '26de27b12d6a37c47d9714107d07aac9')
 
diff --git a/community/python-bottleneck/PKGBUILD b/community/python-bottleneck/PKGBUILD
new file mode 100644
index 000000000..d8a91a082
--- /dev/null
+++ b/community/python-bottleneck/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 112744 2014-06-05 22:38:40Z aginiewicz $
+# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
+# Contributor: Michael Schubert <mschu.dev at gmail>
+# Contributor: Panagiotis Mavrogiorgos (pmav99) <> (gmail)
+
+pkgbase=python-bottleneck
+pkgname=('python2-bottleneck' 'python-bottleneck')
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="Fast NumPy array functions written in Cython"
+arch=('i686' 'x86_64')
+url="http://berkeleyanalytics.com/bottleneck/"
+license=('BSD')
+makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy')
+source=("https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${pkgver}.tar.gz")
+md5sums=('1a363fa35ce521eebb838e1bd6520e24')
+
+build() {
+  cd "$srcdir"
+  cp -a Bottleneck-${pkgver} Bottleneck-py2-${pkgver}
+
+  msg "Building Python2"
+  cd "$srcdir"/Bottleneck-py2-${pkgver}
+  python2 setup.py build
+
+  msg "Building Python3"
+  cd "$srcdir"/Bottleneck-${pkgver}
+  python setup.py build
+}
+
+package_python2-bottleneck() {
+  depends=('python2-numpy')
+  optdepends=('python2-nose: needed for integrated test suite'
+              'python2-scipy: needed for integrated benchmarks')
+
+  cd "$srcdir"/Bottleneck-py2-${pkgver}
+
+  python2 setup.py install --skip-build --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python-bottleneck() {
+  depends=('python-numpy')
+  optdepends=('python-nose: needed for integrated test suite'
+              'python-scipy: needed for integrated benchmarks')
+
+  cd "$srcdir"/Bottleneck-${pkgver}
+
+  python setup.py install --skip-build --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index e887e56ce..f767c18a9 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 99121 2013-10-24 20:42:11Z seblu $
+# $Id: PKGBUILD 112784 2014-06-07 10:56:52Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
 pkgver=0.99.22.4
-pkgrel=3
+pkgrel=4
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
 url='http://www.quagga.net'
 license=('GPL2')
-depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
+depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses' 'perl')
 options=('!buildflags')
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -19,7 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service')
+        'zebra.service'
+        'fix_readline36.patch')
 md5sums=('27ef98abb1820bae19eb71f631a10853'
          '20a8e36ad851d4e06467aeb56a84b245'
          'cc90c234aac9098c5132d653037d5269'
@@ -28,7 +29,8 @@ md5sums=('27ef98abb1820bae19eb71f631a10853'
          '260f5fcf9b53ef201a8fb34e7ea90457'
          'b6e3549d780355914ae8edd43e15630a'
          '72dd63c49fdaea41729a4318d0fbac79'
-         '577f1e7caeea31d910f2dc29c28ada7d')
+         '577f1e7caeea31d910f2dc29c28ada7d'
+         'f4162b77d4995c6d080ac34d9fd17c36')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/community/quagga/fix_readline36.patch b/community/quagga/fix_readline36.patch
new file mode 100644
index 000000000..710fdf3d0
--- /dev/null
+++ b/community/quagga/fix_readline36.patch
@@ -0,0 +1,14 @@
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -2211,9 +2211,9 @@
+ vtysh_readline_init (void)
+ {
+   /* readline related settings. */
+-  rl_bind_key ('?', (Function *) vtysh_rl_describe);
++  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
+   rl_completion_entry_function = vtysh_completion_entry_function;
+-  rl_attempted_completion_function = (CPPFunction *)new_completion;
++  rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
+   /* do not append space after completion. It will be appended
+    * in new_completion() function explicitly. */
+   rl_completion_append_character = '\0';
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 79081382e..4ba0d36d7 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111978 2014-05-27 11:55:39Z arodseth $
+# $Id: PKGBUILD 112758 2014-06-06 11:51:43Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('x86_64' 'i686')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('eebaa57322167f94010e44adbc44b9efeefd1f164fce10bceca363a14fc5d261')
+sha256sums=('8bad6e1241aba32001f8bbf6dfb368756a2c3e44dc96d712849a7de6f7540f23')
 
 prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD
index 2e0be090d..8896a826a 100644
--- a/community/stella/PKGBUILD
+++ b/community/stella/PKGBUILD
@@ -5,12 +5,13 @@
 
 pkgname=stella
 pkgver=3.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform Atari 2600 VCS emulator"
 arch=('i686' 'x86_64')
 url="http://stella.sourceforge.net"
 license=('GPL')
 depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache')
+makedepends=('glu')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz)
 md5sums=('007d45faa46341763da31f87d55df2d8')
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 791ceaece..41a1505a5 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214302 2014-06-05 12:54:53Z seblu $
+# $Id: PKGBUILD 214323 2014-06-06 07:30:23Z seblu $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
@@ -22,8 +22,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
 md5sums=('8d6d684a9430d5cc98a62a5d8fbda8cf'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90'
-         'ea2a61c8bd43788d81d98f1ac36c98ac')
+         '3bf51be3a1bbd262be46dc619f92aa90')
 
 prepare() {
 	cd $srcdir/$pkgname-$_ver
diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD
index 1cc0dda7b..e36cfa7a8 100644
--- a/extra/geoclue2/PKGBUILD
+++ b/extra/geoclue2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 210441 2014-04-14 20:06:15Z jgc $
+# $Id: PKGBUILD 214368 2014-06-07 21:05:17Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=geoclue2
-pkgver=2.1.4
-pkgrel=1
+pkgver=2.1.8
+pkgrel=2
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
 arch=(i686 x86_64)
 url="http://geoclue.freedesktop.org/"
 license=(LGPL)
-depends=(libsoup json-glib networkmanager)
-makedepends=(intltool geoip python2 modemmanager)
+depends=(libsoup json-glib libnm-glib libmm-glib)
+makedepends=(intltool geoip python2 systemd)
 optdepends=('geoip: geoip-lookup server binary')
 source=(http://freedesktop.org/software/geoclue/releases/${pkgver:0:3}/geoclue-$pkgver.tar.xz)
-md5sums=('2300c342f6b3ef0e0befe4fd3f0cabc4')
+md5sums=('49096b9c3c2458b5e8e36b886983d9aa')
 
 build() {
   cd geoclue-$pkgver
diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD
index 7967c69f4..37bd9e625 100644
--- a/extra/hunspell/PKGBUILD
+++ b/extra/hunspell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197086 2013-10-21 18:34:57Z andyrtr $
+# $Id: PKGBUILD 214337 2014-06-06 21:48:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
 
 pkgname=hunspell
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="Spell checker and morphological analyzer library and program"
 arch=('i686' 'x86_64')
 url="http://hunspell.sourceforge.net/"
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'MPL')
 depends=('gcc-libs' 'readline')
 optdepends=('perl: for ispellaff2myspell')
 source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz)
-md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8')
+md5sums=('4967da60b23413604c9e563beacc63b4')
 
 build() {
   cd "$srcdir/hunspell-$pkgver"
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
index 139100fb7..e7ae5596a 100644
--- a/extra/libevdev/PKGBUILD
+++ b/extra/libevdev/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213044 2014-05-17 19:04:52Z andyrtr $
+# $Id: PKGBUILD 214330 2014-06-06 20:59:43Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libevdev
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Wrapper library for evdev devices"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('python2' 'check' 'valgrind' 'doxygen')
 #checkdepends=('kmod')
 source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('7cc522bee24f0c3e70ecf0a1c312258d7155e8197292cfeeeb85f2959edb1e38')
+sha256sums=('860e9a1d5594393ff1f711cdeaf048efe354992019068408abbcfa4914ad6709')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD
index 63fd40816..52979e2ee 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 197088 2013-10-21 18:34:59Z andyrtr $
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# $Id: PKGBUILD 214354 2014-06-07 14:41:16Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libice
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.0.9
+pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto>=7.0.18')
-makedepends=('xtrans>=1.2.5')
+makedepends=('xtrans>=1.2.5' 'xorg-util-macros')
 source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
 license=('custom')
-sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324')
+sha256sums=('8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202')
 
 build() {
   cd libICE-${pkgver}
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index 6bec9aa3d..4b285bfd8 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 202705 2013-12-25 17:35:47Z andyrtr $
+# $Id: PKGBUILD 214335 2014-06-06 21:45:06Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxft
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.2
+pkgrel=1
 pkgdesc="FreeType-based font drawing library for X"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('fontconfig' 'libxrender')
 makedepends=('pkgconfig')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
-        freetype_header.patch)
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd'
-            '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9')
+source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2)
+sha256sums=('f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c')
 
 build() {
   cd "${srcdir}/libXft-${pkgver}"
-  # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4
-  patch -Np1 -i ${srcdir}/freetype_header.patch
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
diff --git a/extra/libxft/freetype_header.patch b/extra/libxft/freetype_header.patch
deleted file mode 100644
index 9aba8ee29..000000000
--- a/extra/libxft/freetype_header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Mon, 02 Dec 2013 15:26:24 +0000
-Subject: Use FT_*_H macros instead of including <freetype/*.h>
-
-freetype moved its headers around in 2.5.1.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 2f3dc5a..4b5fb82 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -21,10 +21,10 @@
-  */
- 
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
- 
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
- 
- /*
-  * Validate the memory info for a font
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 4286dc01e..f6672c08a 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212084 2014-05-06 15:28:08Z dan $
+# $Id: PKGBUILD 214370 2014-06-07 21:26:22Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.19
+pkgver=1.4.20
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ optdepends=('perl: for memcached-tool usage')
 install=memcached.install
 source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
         memcached.service)
-sha256sums=('5e18eac2e5b557d7a98b5e866b01ff5fd0f7ceac7356f7b9fffbf8ddbea4a58d'
+sha256sums=('25d121408eed0b1522308ff3520819b130f04ba0554c68a673af23a915a54018'
             'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
 
 build() {
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 9c4010b0b..c39ff424e 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 207487 2014-03-10 22:28:52Z heftig $
+# $Id: PKGBUILD 214366 2014-06-07 21:02:51Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Mobile broadband modem management service"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -38,16 +38,20 @@ package_modemmanager() {
   make DESTDIR="$pkgdir" -C libmm-glib uninstall
   make DESTDIR="$pkgdir" -C vapi uninstall
 
-  mv -f "$pkgdir/usr/lib/pkgconfig/mm-glib.pc" ..
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
 }
 
 package_libmm-glib() {
   pkgdesc="ModemManager library"
   depends=(glib2)
 
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
   cd ModemManager-$pkgver
   make DESTDIR="$pkgdir" -C libmm-glib install
   make DESTDIR="$pkgdir" -C vapi install
-
-  install -Dm644  ../mm-glib.pc "$pkgdir/usr/lib/pkgconfig/mm-glib.pc"
 }
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 68950f5a5..23b32c596 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211827 2014-04-27 16:57:26Z heftig $
+# $Id: PKGBUILD 214364 2014-06-07 20:54:18Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,43 +6,36 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 # Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
-pkgname=networkmanager
-_pkgname=NetworkManager
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
 pkgver=0.9.8.10
-pkgrel=1
+pkgrel=3
 pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client libsoup systemd libmm-glib)
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git ppp modemmanager)
-optdepends=('dhclient: DHCPv6 support'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support'
-            'ppp: Dialup connection support')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git ppp modemmanager
+             dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client libsoup systemd
+             libmm-glib)
 #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
 sha256sums=('064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd NetworkManager-$pkgver
   patch -Np1 -i ../disable_set_hostname.patch
 }
 
 build() {
-  cd $_pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
+  cd NetworkManager-$pkgver
+  ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
     --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/networkmanager \
     --with-crypto=nss \
     --with-dhclient=/usr/bin/dhclient \
     --with-dhcpcd=/usr/bin/dhcpcd \
@@ -62,12 +55,42 @@ build() {
   make
 }
 
-package() {
-  cd $_pkgname-$pkgver
+package_networkmanager() {
+  depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhcp-client libsoup libmm-glib)
+  optdepends=('dhclient: DHCPv6 support'
+              'dnsmasq: Connection sharing'
+              'bluez: Bluetooth support'
+              'openresolv: resolvconf support'
+              'ppp: Dialup connection support')
+  install=networkmanager.install
+  backup=('etc/NetworkManager/NetworkManager.conf')
+
+  cd NetworkManager-$pkgver
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnm-glib uninstall
+  make DESTDIR="$pkgdir" -C libnm-util uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
   install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
 
   rm -r "$pkgdir/var/run"
 }
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager library"
+  depends=(libsystemd nss dbus-glib libutil-linux)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd NetworkManager-$pkgver
+  make DESTDIR="$pkgdir" -C libnm-util install
+  make DESTDIR="$pkgdir" -C libnm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 2a31a43f2..1a6320372 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 212049 2014-05-05 12:26:57Z andyrtr $
+# $Id: PKGBUILD 214341 2014-06-06 22:03:53Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
-_amalgamationver=3080403
+_amalgamationver=3080500
 _docver=${_amalgamationver}
 #_docver=3080001
-pkgver=3.8.4.3
-pkgrel=2
+pkgver=3.8.5
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom:Public Domain')
@@ -17,19 +17,11 @@ makedepends=('tcl' 'readline')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz
 	http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip
-	license.txt
-	sqlite-nautilus.patch)
+	license.txt)
 options=('!emptydirs')
-sha1sums=('70f3b100fa22e5bfebfe1b0a2102612e3c6c53fb'
-          'ce8615799a9da7fc9d2cbcd2774d77da4ba72417'
-          'f34f6daa4ab3073d74e774aad21d66878cf26853'
-          '4e9a4f80c91bbaf80f0f45b9b97fb1cbe3464bc7')
-
-prepare() {
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  # https://bugs.archlinux.org/task/39861
-  patch -Np1 -i ${srcdir}/sqlite-nautilus.patch
-}
+sha1sums=('7f667e10ccebc26ab2086b8a30cb0a600ca0acae'
+          'c5655a4004095c50dc8403661e0ed02fd4191d57'
+          'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
diff --git a/extra/sqlite/sqlite-nautilus.patch b/extra/sqlite/sqlite-nautilus.patch
deleted file mode 100644
index 046b1acfa..000000000
--- a/extra/sqlite/sqlite-nautilus.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream fix for the issue that caused nautilus to crash.
-RHBZ: #1075889
-
---- src/sqlite3.c
-+++ src/sqlite3.c
-@@ -4855,18 +4855,10 @@
-   ** rowid appears in the ORDER BY clause, the corresponding WhereLoop is
-   ** automatically order-distinct.
-   */
- 
-   assert( pOrderBy!=0 );
--
--  /* Sortability of virtual tables is determined by the xBestIndex method
--  ** of the virtual table itself */
--  if( pLast->wsFlags & WHERE_VIRTUALTABLE ){
--    testcase( nLoop>0 );  /* True when outer loops are one-row and match 
--                          ** no ORDER BY terms */
--    return pLast->u.vtab.isOrdered;
--  }
-   if( nLoop && OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ) return 0;
- 
-   nOrderBy = pOrderBy->nExpr;
-   testcase( nOrderBy==BMS-1 );
-   if( nOrderBy>BMS-1 ) return 0;  /* Cannot optimize overly large ORDER BYs */
-@@ -4875,11 +4867,14 @@
-   orderDistinctMask = 0;
-   ready = 0;
-   for(iLoop=0; isOrderDistinct && obSat<obDone && iLoop<=nLoop; iLoop++){
-     if( iLoop>0 ) ready |= pLoop->maskSelf;
-     pLoop = iLoop<nLoop ? pPath->aLoop[iLoop] : pLast;
--    assert( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 );
-+    if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
-+      if( pLoop->u.vtab.isOrdered ) obSat = obDone;
-+      break;
-+    }
-     iCur = pWInfo->pTabList->a[pLoop->iTab].iCursor;
- 
-     /* Mark off any ORDER BY term X that is a column in the table of
-     ** the current loop for which there is term in the WHERE
-     ** clause of the form X IS NULL or X=? that reference only outer
-
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index c84735848..10c4eb186 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,28 +1,31 @@
-# $Id: PKGBUILD 213550 2014-05-24 15:45:22Z heftig $
+# $Id: PKGBUILD 214360 2014-06-07 18:26:36Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
 license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gst-plugins-base-libs
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
          libsecret libwebp harfbuzz-icu)
-makedepends=(gtk3 gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby gtk-doc)
 optdepends=('gst-plugins-base: free media decoding'
             'gst-plugins-good: media decoding'
             'gst-libav: nonfree media decoding')
 options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
         fix-pretty-quotes.patch)
-sha256sums=('cac8385c3b8a956793eb6b67712c23297a39e5f8b429523f32bbdcdf9c21d00a'
+sha256sums=('9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac'
             '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
 
 prepare() {
-  mkdir build-gtk{,2}
+  mkdir build-gtk{,2} path
+
+  ln -s /usr/bin/python2 path/python
+
   cd $pkgbase-$pkgver
   patch -Np0 -i ../fix-pretty-quotes.patch
 }
@@ -43,6 +46,8 @@ _build() (
 )
 
 build() {
+  PATH="$srcdir/path:$PATH"
+
   _build gtk --enable-gtk-doc
   _build gtk2 --disable-webkit2 --with-gtk=2.0
 }