14 files changed, 188 insertions, 52 deletions
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 0ca10b54b..006e17429 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,42 +1,45 @@
-# $Id: PKGBUILD 61627 2012-01-04 23:16:10Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 71212 2012-05-25 00:16:39Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
 depends=('libnetfilter_conntrack')
 backup=('etc/conntrackd/conntrackd.conf')
-source=("http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
         'conntrackd.rc'
-        'conntrackd.conf')
+        'conntrackd.conf'
+        'conntrackd.service')
 md5sums=('8a60f02a177fc31fe40cc992c4de90e2'
-         '619ab1e15837436b47cbdc739d69ee78'
-         '92a7fc6ab5cba5e48cde4cac0ac403b1')
+         '977dfb8fc58df0c74120c8ac92026a6a'
+         '92a7fc6ab5cba5e48cde4cac0ac403b1'
+         'bd135eaefb47923bb8e8d26f084d3e9d')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  # initscripts scripts
+  # install binaries
+  pushd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  popd
+  # initscripts & systemd
   install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd"
   install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd"
-
+  install -D -m 644 conntrackd.service \
+    "$pkgdir/usr/lib/systemd/system/conntrackd.service"
   # install empty configuration files
-  install -D -m 644 /dev/null "${pkgdir}/etc/conntrackd/conntrackd.conf"
-
-  # install binaries
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd/conntrackd.conf"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc
index ba1c7ef49..a7040c633 100644
--- a/community/conntrack-tools/conntrackd.rc
+++ b/community/conntrack-tools/conntrackd.rc
@@ -4,31 +4,30 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME=conntrackd
 DAEMON=/usr/sbin/conntrackd
 PID=$(pidof -o %PPID $DAEMON)
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.service b/community/conntrack-tools/conntrackd.service
new file mode 100644
index 000000000..25a113785
--- /dev/null
+++ b/community/conntrack-tools/conntrackd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/sbin/conntrackd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index 58909f0f8..b97e91920 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 70622 2012-05-13 09:46:34Z jlichtblau $
+# $Id: PKGBUILD 71118 2012-05-24 14:06:52Z tomegun $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
 pkgver=2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64')
 url="http://kid3.sourceforge.net/"
 license=('GPL')
-depends=('chromaprint' 'id3lib' 'qt' 'tunepimp' 'kdelibs')
+depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime')
 makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
 options=('!makeflags')
 install=$pkgname.install
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
index bb82fc98c..778908a3c 100644
--- a/community/python2-basemap/PKGBUILD
+++ b/community/python2-basemap/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 62219 2012-01-18 13:46:59Z stephane $
+# $Id: PKGBUILD 71122 2012-05-24 14:57:31Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Julien Morin <jmorin@cp.dias.ie>
 
 pkgname=python2-basemap
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Toolkit for plotting data on map projections"
 arch=('i686' 'x86_64')
 url="http://matplotlib.sourceforge.net/basemap/doc/html/"
 license=('custom')
-depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') 
+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=('234cdf591e6217de78452d7be2500781c85f5fb4')
+sha1sums=('ee5913726d31a76a5c40451dd248977355ea3cff')
 
 build() {
    cd "${srcdir}/basemap-${pkgver}"
- 
+
    # Remove the bundled librarie
    rm -r geos-?.?.?
 
    sed -i "s/lib64/lib/g" setup.py
-  
+
    python2 setup.py config
    python2 setup.py build
 }
@@ -31,7 +31,7 @@ package() {
 
    _pybasever=2.7
 
-   python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr 
+   python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
 
    # Conflict with files from python2-matplotlib
    rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index bec883a14..44356ee39 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70968 2012-05-20 21:22:58Z jlichtblau $
+# $Id: PKGBUILD 71192 2012-05-24 17:21:45Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('c720dbe484f5cc164cdacfbf70fcb37832de5f0b416cd482147e710b57570e68'
+sha256sums=('89f1021bda2bba054cb6d4363bb04fd5002fc34ccd01c73aa2513e99cfd65535'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index 367591af7..f9934e824 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.4.2-1
+
 2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.4.1-1
 
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 29b1f109f..a64e97ece 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70310 2012-05-04 09:33:19Z spupykin $
+# $Id: PKGBUILD 71108 2012-05-24 08:34:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.13
+pkgver=2.4.14
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('f8a160f8a6fe7d7e8ebb4c23ff583d71'
+md5sums=('1bc8f833b955ef119d643da08084433f'
          '4f2c02b481283d1336508c988e60e8d8'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
new file mode 100644
index 000000000..6e277f729
--- /dev/null
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 71106 2012-05-24 07:04:34Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ubuntuone-client-gnome
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/ubuntuone-client-gnome"
+license=('GPL')
+depends=('nautilus' 'evolution-data-server' 'ubuntuone-client')
+makedepends=('intltool' 'gnome-settings-daemon')
+optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/ubuntuone-client-gnome/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz
+        fix-build.patch)
+md5sums=('20cc05860c3d3dc2c294f4001cbc9108'
+         'cabbf043f9be0ea8df4c9a4b020cd2c3'
+         '8d34fed775be23d1743dda079a293b78')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/fix-build.patch"
+
+  # Install language files
+  echo 'am ar ast az be bg bn bs ca ca@valencia cs da de el en_AU en_GB eo es et eu fi fo fr gd gl gu he hi hr hu id it ja kk km ko ku lt lv ms my nb nl nn oc pa pl pt pt_BR ro ru shn si sk sl sq sr sv ta te th tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  rename $pkgname- '' ../po/$pkgname-*.po
+  mv -f -t po ../po/*
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/ubuntuone-client-gnome/fix-build.patch b/community/ubuntuone-client-gnome/fix-build.patch
new file mode 100644
index 000000000..237ba323e
--- /dev/null
+++ b/community/ubuntuone-client-gnome/fix-build.patch
@@ -0,0 +1,13 @@
+diff -Naur ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c ubuntuone-client-gnome-3.0.0/nautilus/utils.c
+--- ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c	2012-02-22 16:40:56.000000000 +0100
++++ ubuntuone-client-gnome-3.0.0/nautilus/utils.c	2012-05-13 22:26:35.267409857 +0200
+@@ -26,8 +26,7 @@
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <glib/gi18n.h>
+-#include <glib/gutils.h>
+-#include <glib/gfileutils.h>
++#include <glib.h>
+ #include <libnautilus-extension/nautilus-file-info.h>
+ #include <libsyncdaemon/libsyncdaemon.h>
+ #include "ubuntuone-nautilus.h"
diff --git a/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install b/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install
new file mode 100644
index 000000000..7a903e80c
--- /dev/null
+++ b/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD
new file mode 100644
index 000000000..a3ed20691
--- /dev/null
+++ b/community/ubuntuone-client/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 71102 2012-05-24 05:37:26Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ubuntuone-client
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/ubuntuone-client"
+license=('GPL')
+depends=('dbus-glib' 'python2-distribute' 'python2-pyinotify' 'python2-ubuntuone-storageprotocol' 'python2-gobject' 'libnotify' 'python2-configglue' 'ubuntu-sso-client' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake' 'gobject-introspection' 'vala')
+optdepends=('ubuntu-sso-client-qt: required for first-time log in')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/ubuntuone-client/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz)
+md5sums=('5eef323d4d1fa57386ebacdc07e8a49b'
+         '6f4603f11ea21d030bfaef34d3567f68')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
+
+  # Install language files
+  echo 'ace af am an ar ast az be bg bn bo br bs ca ca@valencia ckb crh cv cy cs csb da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy gd gl gu he hi hr hu hy id is it ja jv kk km kn ko ku ky lt lv ml mr ms my nb nds nl nn oc pl pt pt_BR ro ru sd shn si sk sl sq sr sv ta te th tr ug uk ur uz vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  rename $pkgname- '' ../po/$pkgname-*.po
+  mv -f -t po ../po/*
+
+  # Fix desktop file
+  sed -i 's/ubuntuone-installer/ubuntuone-control-panel-qt/' \
+    ubuntuone/platform/linux/{messaging,launcher}.py
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  # We don't have Apport in Arch Linux
+  rm -r "$pkgdir"/{etc/apport,usr/share/apport}
+}
diff --git a/community/ubuntuone-client/ubuntuone-client.install b/community/ubuntuone-client/ubuntuone-client.install
new file mode 100644
index 000000000..2c455e952
--- /dev/null
+++ b/community/ubuntuone-client/ubuntuone-client.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index d7dfe1f74..ec9fd8e13 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63410 2012-02-02 10:13:55Z bisson $
+# $Id: PKGBUILD 71115 2012-05-24 13:42:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.16
+pkgver=1.4.17
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
@@ -18,7 +18,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('68ed8737b1a6e3f9a67812f7e962fd6740494c1e'
+sha1sums=('fea4d812c03af4737ef671ac30b7b7400d346516'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')