Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/tp_smapi/PKGBUILD
	community/fish/PKGBUILD
	community/supertux/PKGBUILD
	extra/gvfs/PKGBUILD
	multilib/wine/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lm_sensors/PKGBUILD
	testing/lm_sensors/healthd
	testing/lm_sensors/healthd.rc

22 files changed, 172 insertions, 69 deletions

diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index fa159af53..81d53265e 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159790 2012-05-27 03:26:02Z bisson $
+# $Id: PKGBUILD 164360 2012-07-31 19:42:02Z eric $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
 pkgver=2.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 4572d53c6..341149994 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164230 2012-07-28 01:31:18Z eric $
+# $Id: PKGBUILD 164361 2012-07-31 19:42:30Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -23,7 +23,7 @@ pkgname=('calligra-filters'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 1af79a5f0..c93b469f8 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 148706 2012-02-05 11:47:41Z ibiru $
+# $Id: PKGBUILD 164362 2012-07-31 19:42:40Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
+depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
 makedepends=('boost')
 replaces=('enblend')
 conflicts=('enblend')
@@ -27,7 +27,7 @@ build() {
   sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
   patch -p1 -i ../libpng-1.4.patch
   patch -p0 -i ../enblend-4.0-libpng15.patch
-  ./configure --prefix=/usr
+  LIBS="-lboost_system" ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index 6a2ebed90..3a4a46234 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $
+# $Id: PKGBUILD 164363 2012-07-31 19:42:44Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: SleepyDog
 
 pkgname=glew
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="The OpenGL Extension Wrangler Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
 depends=('libxmu' 'libxi' 'mesa')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1')
+sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index d8a9c7fea..2c7160bbe 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162106 2012-06-20 04:34:13Z eric $
+# $Id: PKGBUILD 164364 2012-07-31 19:42:49Z eric $
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index bc7abd377..43dd19ebc 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160359 2012-06-01 12:58:23Z dreisner $
+# $Id: PKGBUILD 164365 2012-07-31 19:42:58Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
 pkgver=1.12.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 1ba367927..b193897a7 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163705 2012-07-18 01:05:24Z ibiru $
+# $Id: PKGBUILD 164366 2012-07-31 19:43:06Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 7844a0d1d..242c77dfd 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 157452 2012-04-28 13:14:16Z ibiru $
+# $Id: PKGBUILD 164367 2012-07-31 19:43:09Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgpod
 pkgver=0.8.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
+depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist')
 makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
 optdepends=('gtk-sharp-2: Mono bindings'
             'python2-gobject2: python bindings')
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
index 2051bffc6..acb8c4530 100644
--- a/extra/libimobiledevice/PKGBUILD
+++ b/extra/libimobiledevice/PKGBUILD
@@ -1,28 +1,21 @@
-# $Id: PKGBUILD 156906 2012-04-23 09:08:47Z ibiru $
+# $Id: PKGBUILD 164368 2012-07-31 19:43:16Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libimobiledevice
-pkgver=1.1.1
-pkgrel=3
+pkgver=1.1.4
+pkgrel=1
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt')
-makedepends=('python2' 'swig')
+depends=('usbmuxd' 'gnutls' 'libgcrypt')
 options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
-        swig-version-check.patch)
-md5sums=('cdc13037e822d9ac2e109536701d153a'
-         '8bb215e36fe0e08a72332c108c7842cc')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # SWIG version check is wrong (still not fixed upstream)
-  patch -p1 -i ../swig-version-check.patch
-
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
@@ -31,3 +24,4 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD
new file mode 100644
index 000000000..600e095a3
--- /dev/null
+++ b/extra/netcdf-cxx/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 164375 2012-07-31 20:02:04Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=netcdf-cxx
+pkgver=4.2
+pkgrel=1
+pkgdesc="NetCDF c++ bindings"
+arch=("i686" "x86_64")
+url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp"
+depends=('gcc-libs' 'netcdf' 'curl')
+options=('!libtool' '!makeflags')
+license=('custom')
+source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-${pkgver}.tar.gz)
+sha1sums=('59628c9f06c211a47517fc00d8b068da159ffa9d')
+
+build() {
+  cd ${srcdir}/${pkgname}4-${pkgver}
+  ./configure --prefix=/usr --enable-shared
+  make
+#  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}4-${pkgver}
+
+  install -m755 -d ${pkgdir}/usr/lib
+  install -m755 -d ${pkgdir}/usr/share/man
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 ${srcdir}/${pkgname}4-${pkgver}/COPYRIGHT \
+        ${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT
+
+}
diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD
new file mode 100644
index 000000000..415844e0a
--- /dev/null
+++ b/extra/netcdf-fortran/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 164376 2012-07-31 20:07:54Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=netcdf-fortran
+pkgver=4.2
+pkgrel=1
+pkgdesc="NetCDF fortran bindings"
+arch=("i686" "x86_64")
+url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp"
+depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran')
+options=('!libtool' '!makeflags')
+license=('custom')
+install=${pkgname}.install
+source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-fortran-${pkgver}.tar.gz)
+sha1sums=('f1887314455330f4057bc8eab432065f8f6f74ef')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-shared
+  make
+#  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -m755 -d ${pkgdir}/usr/lib
+  install -m755 -d ${pkgdir}/usr/share/man
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYRIGHT \
+        ${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT
+
+}
diff --git a/extra/netcdf-fortran/netcdf-fortran.install b/extra/netcdf-fortran/netcdf-fortran.install
new file mode 100644
index 000000000..38e5bc58e
--- /dev/null
+++ b/extra/netcdf-fortran/netcdf-fortran.install
@@ -0,0 +1,19 @@
+info_dir=/usr/share/info
+info_files=(netcdf-f77.info netcdf-f77.info-1 netcdf-f77.info-2 netcdf-f90.info)
+
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index bb9119057..27af416b2 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 148503 2012-02-02 20:25:58Z ronald $
+# $Id: PKGBUILD 164373 2012-07-31 19:53:39Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=netcdf
-pkgver=4.1.3
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
-depends=('gcc-libs' 'hdf5' 'gcc-fortran' 'curl')
+depends=('gcc-libs' 'hdf5' 'curl')
+optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
 options=('!libtool' '!makeflags')
 license=('custom')
 source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz)
-sha1sums=('e600322478276f51612e17cca3cda38489003f81')
+sha1sums=('dfb6b10ef8dd20e785efa5e29b448383090f144d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD
index e007eda90..6ee27c93e 100644
--- a/extra/opennx/PKGBUILD
+++ b/extra/opennx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162885 2012-07-02 16:49:28Z andyrtr $
+# $Id: PKGBUILD 164356 2012-07-31 16:14:21Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Armin Luntzer
 # Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk
 
 pkgname=opennx
-pkgver=0.16.0.713
+pkgver=0.16.0.719
 pkgrel=1
 pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser"
 url="http://opennx.sf.net/"
@@ -14,7 +14,7 @@ depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl')
 makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat')
 #optdepends=('cups: for full local printing support')
 source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz)
-md5sums=('9699fd2d9b19b8d0fb37959ace846666')
+md5sums=('bb0ca1df36f4d9246c6f88d734be937b')
 
 build() {
   cd $srcdir/opennx*
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 8e4586cf2..0701a5435 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $
+# $Id: PKGBUILD 164350 2012-07-31 09:59:25Z eric $
 # Maintainer:
 
 pkgname=('python-lxml' 'python2-lxml')
-pkgver=2.3.4
-pkgrel=2
+pkgver=2.3.5
+pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('90a226d8a2ee38de47fc3351445dab6df0e33a20'
-          '7962be7794d7f4c87d2fce0104c27990f48f1ce1')
+sha1sums=('4fec0ca5054a8d6220d3dc7230a5066850192848'
+          'd74ad6509a0048ea0e979985e12869f2e1126b78')
 
 check() {
   cd "${srcdir}"/lxml-$pkgver
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 07e04c98b..40647db10 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163812 2012-07-20 12:21:50Z heftig $
+# $Id: PKGBUILD 164369 2012-07-31 19:43:21Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=2.97
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 699f9ef42..1016c4ba2 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $
+# $Id: PKGBUILD 164387 2012-08-01 01:21:35Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.11
+pkgver=8.5.12
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('b01a9691c83990b3db0ce62d1012ca67')
+md5sums=('174b2b4c619ba8f96875d8a051917703')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
@@ -24,10 +24,10 @@ build() {
   make
 }
 
-#check() {
-#  cd ${srcdir}/tcl${pkgver}/unix
-#  make test
-#}
+check() {
+  cd ${srcdir}/tcl${pkgver}/unix
+  make test
+}
 
 package()
 {
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index ef1c58f8e..1f13b1b6a 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $
+# $Id: PKGBUILD 164388 2012-08-01 01:21:39Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.11
+pkgver=8.5.12
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('b61b72f0aad230091b100746f078b8f1')
+md5sums=('a01640176845c1f654a412cfc9bab13b')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 0f5a19c5e..010857cd7 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163113 2012-07-07 10:34:53Z tomegun $
+# $Id: PKGBUILD 164370 2012-07-31 19:43:25Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
 pkgver=0.9.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://upower.freedesktop.org"
diff --git a/extra/usbmuxd/85-usbmuxd.rules b/extra/usbmuxd/85-usbmuxd.rules
new file mode 100644
index 000000000..ec9f72501
--- /dev/null
+++ b/extra/usbmuxd/85-usbmuxd.rules
@@ -0,0 +1,9 @@
+# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
+
+# Forces iDevices to the last USB configuration and runs usbmuxd
+TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
+LABEL="usbmuxd_systemd_end"
+
+# Exit usbmuxd when the last device is removed
+ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index fd3d85e9b..dd234ef85 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 158609 2012-05-05 03:08:45Z allan $
+# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=usbmuxd
-pkgver=1.0.7
-pkgrel=3
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb>=1.0.8')
+depends=('libusb' 'libplist')
 makedepends=('cmake')
 install=usbmuxd.install
-source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        usbmuxd-udevuser.patch)
-md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
-         '8526f24f4ad16cd6b2a7321c0b59592c')
+source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
+	'usbmuxd.service'
+	'85-usbmuxd.rules')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
+  echo "${pkgver}" > version.tag
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
@@ -33,4 +32,11 @@ package() {
   # fix udev dir being hardcoded
   mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
   rmdir "${pkgdir}/lib"
+  # install systemd service file
+  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
+  # use udev rule that works with systemd
+  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
 }
+md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
+         'dae0660f972510a6483992b5b81e1b5a'
+         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/extra/usbmuxd/usbmuxd.service b/extra/usbmuxd/usbmuxd.service
new file mode 100644
index 000000000..fbebf65b9
--- /dev/null
+++ b/extra/usbmuxd/usbmuxd.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=iOS USB Muxer
+
+[Service]
+ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux