Thu Aug 23 00:03:08 UTC 2012

14 files changed, 82 insertions, 55 deletions

diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index cb9bdbfc9..49ce93a61 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75347 2012-08-20 19:15:16Z dreisner $
+# $Id: PKGBUILD 75385 2012-08-21 18:13:22Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
@@ -8,7 +8,7 @@
 
 pkgname=chrony
 pkgver=1.26
-pkgrel=5
+pkgrel=7
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64')
 url="http://chrony.tuxfamily.org/"
@@ -21,7 +21,7 @@ source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
         service)
 md5sums=('ad6dd619ff1986e4ff780363c64e2246'
          'd8b653c8bcc76cef00aa10fbd3eeb4f7'
-         'd78e6189c6f51a2af30a65bdedcdb2eb')
+         '778d85a6b42ccfab6460ec257b39ca4d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -37,6 +37,6 @@ package() {
   install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony
   install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
 
-  install -dm755 "$pkgdir/usr/lib/ntp-units.d"
-  echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list"
+  install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
+  echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
 }
diff --git a/community/chrony/service b/community/chrony/service
index 8bc8da9d2..b04196f77 100644
--- a/community/chrony/service
+++ b/community/chrony/service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Chrony Network Time Daemon
+After=network.target
 
 [Service]
 Type=forking
diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD
index 4b0695154..0ca635b09 100644
--- a/community/gputils/PKGBUILD
+++ b/community/gputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61926 2012-01-11 02:52:12Z ebelanger $
+# $Id: PKGBUILD 75360 2012-08-21 09:13:35Z ebelanger $
 # Contributor: Johannes Martin <honzor@gmx.net>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gputils
-pkgver=0.14.1
+pkgver=0.14.2
 pkgrel=1
 pkgdesc="PIC Programming Utilities"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://gputils.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d896de172a10afb77156a4fb8f393942')
+md5sums=('90fa2803e77723de32b482f6a57d9c5a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 123c4a0df..1d2778c8d 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75108 2012-08-14 06:07:46Z seblu $
+# $Id: PKGBUILD 75353 2012-08-21 06:05:32Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.5
+pkgver=1.2.6
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.rc'
         'keepalived.service'
         'keepalived.conf')
-md5sums=('fce2b998cb3c81a4eb8eb960b1d8413f'
+md5sums=('299f8c7eae521753c3e1f2689974982a'
          '0d7ea6296bce403a5d24be305a0a9d73'
          '7a327df915700dcd45a049d099c9c42b'
          '9c8142da8730ad27a345587dea83ced7')
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index 5016dbbd4..83e17e7ec 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74962 2012-08-10 10:08:18Z bpiotrowski $
+# $Id: PKGBUILD 75383 2012-08-21 18:02:55Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.25
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://mariadb.org/"
@@ -117,7 +117,7 @@ package_mariadb() {
   install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
   install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
 
-  install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysql.service
+  install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
   install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
 
   # provided by libmariadbclient
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
index c9cc75b47..921147428 100644
--- a/community/mariadb/mariadb.install
+++ b/community/mariadb/mariadb.install
@@ -21,6 +21,11 @@ post_upgrade(){
     done
     rm -rf /data
   fi
+
+  if [ "$(vercmp $2 5.5.25-5)" -lt 0 ]; then
+    echo ">>> mysql.service has been renamed to mysqld.service to keep"
+    echo "    consistency with MySQL package." 
+  fi
 }
 
 post_remove(){
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
index a6f4aa032..75a653a32 100644
--- a/community/mpdscribble/PKGBUILD
+++ b/community/mpdscribble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74713 2012-08-02 09:37:39Z bpiotrowski $
+# $Id: PKGBUILD 75389 2012-08-21 18:46:41Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: evr <evanroman at gmail>
@@ -6,7 +6,7 @@
 
 pkgname=mpdscribble
 pkgver=0.22
-pkgrel=4
+pkgrel=5
 pkgdesc='An mpd client which submits track info to last.fm'
 url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
 arch=('i686' 'x86_64')
@@ -38,7 +38,7 @@ package() {
   install -D "${srcdir}"/rc.d \
     "${pkgdir}"/etc/rc.d/mpdscribble
 
-  install -D "${srcdir}"/service \
+  install -Dm644 "${srcdir}"/service \
     "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service
 
   # default config is really an example
diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD
index 7fc2b5931..060801249 100644
--- a/community/oath-toolkit/PKGBUILD
+++ b/community/oath-toolkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72623 2012-06-17 17:18:54Z seblu $
+# $Id: PKGBUILD 75356 2012-08-21 06:18:32Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: L42y <423300@gmail.com>
 
 pkgname=oath-toolkit
-pkgver=1.12.4
+pkgver=1.12.5
 pkgrel=1
 pkgdesc='OATH one-time password toolkit'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('pam')
 options=('!libtool')
 source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b8c267bb007a634c0f3514697060cb2d')
+md5sums=('74b8a8616be0c7f94e92eab9703c730a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 899ae7e15..a02bd13c1 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75345 2012-08-20 19:14:50Z dreisner $
+# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=18
+pkgrel=19
 pkgdesc="Free, easy to use implementation of the Network Time Protocol."
 url="http://www.openntpd.org/"
 arch=('x86_64' 'i686')
@@ -53,8 +53,8 @@ package() {
   # avoid conflict with filesystem>=2012.06
   rm -r "$pkgdir/run"
 
-  install -dm755 "$pkgdir/usr/lib/ntp-units.d"
-  echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list"
+  install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
+  echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index cd9d13003..7f17289f9 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 74623 2012-07-31 19:56:37Z ebelanger $
+# $Id: PKGBUILD 75395 2012-08-21 20:06:54Z ebelanger $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
-pkgname=projectm
-pkgver=2.0.1
-pkgrel=6
-pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
+pkgbase=projectm
+pkgname=('projectm' 'libvisual-projectm')
+pkgver=2.1.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
-makedepends=('pkg-config' 'cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz"
-        'libprojectM-2.0.1-pkg-config.patch'
-        'libprojectM-2.0.1-fix-linking.patch')
-md5sums=('f8bf795878cdbbef54784cf2390b4c89'
-         '4f258f4e7c2ab612931936bfd7f1f0fb'
-         '5c178cadf1e00ee4baf32cd9ccbc818c')
+makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
+source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz")
+md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b')
 
 build() {
-  cd "${srcdir}/projectM-${pkgver}-Source"
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
+    -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
+  make
+}
 
-  patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch"
-  patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch"
+package_projectm() {
+  pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
+  depends=('ftgl' 'glew' 'gtkglext')
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM"
+  make DESTDIR="${pkgdir}" install
+  install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf"
 }
 
-package() {
-  cd "${srcdir}/projectM-${pkgver}-Source"
+package_libvisual-projectm() {
+  pkgdesc='ProjectM XMMS plugin.'
+  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
+
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD
index 78ff87669..8307aa178 100644
--- a/community/python-pyzmq/PKGBUILD
+++ b/community/python-pyzmq/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 71478 2012-05-27 09:02:29Z kkeen $
+# $Id: PKGBUILD 75372 2012-08-21 15:10:09Z kkeen $
 # Maintainer: Kyle Keen <keenerd at gmail dot com>
 pkgname=python-pyzmq
-pkgver=2.2.0
+pkgver=2.2.0.1
 pkgrel=1
 pkgdesc="Python3 bindings for zeromq, written in Cython"
 arch=(i686 x86_64)
@@ -9,9 +9,12 @@ url="http://www.zeromq.org/bindings:python"
 license=('LGPL')
 depends=(zeromq python)
 source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
-md5sums=('100b73973d6fb235b8da6adea403566e')
+md5sums=('f2f80709e84c8ac72d6671eee645d804')
 
 build() {
   cd "$srcdir/pyzmq-$pkgver"
+  # py3 errors added in 2.2.0.1 
+  sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py
+  sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py
   python3 setup.py install --root="$pkgdir" --optimize=0
 } 
diff --git a/community/python2-pyzmq/PKGBUILD b/community/python2-pyzmq/PKGBUILD
index 32fd23136..3863778a3 100644
--- a/community/python2-pyzmq/PKGBUILD
+++ b/community/python2-pyzmq/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 71479 2012-05-27 09:07:00Z kkeen $
+# $Id: PKGBUILD 75374 2012-08-21 15:13:14Z kkeen $
 # Maintainer: Kyle Keen <keenerd at gmail dot com>
 pkgname=python2-pyzmq
-pkgver=2.2.0
+pkgver=2.2.0.1
 pkgrel=1
 pkgdesc="Python2 bindings for zeromq, written in Cython"
 arch=(i686 x86_64)
@@ -9,7 +9,7 @@ url="http://www.zeromq.org/bindings:python"
 license=('LGPL')
 depends=(zeromq python2)
 source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
-md5sums=('100b73973d6fb235b8da6adea403566e')
+md5sums=('f2f80709e84c8ac72d6671eee645d804')
 
 build() {
   cd "$srcdir/pyzmq-$pkgver"
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 35cc5a020..e62abfb7e 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74009 2012-07-18 01:08:49Z ibiru $
+# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
-pkgver=1.6.0
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
@@ -26,17 +26,20 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.
 	'arch32-config'
 	'arch32-copyfiles'
 	'arch32-mount'
-	'arch32-nssdatabases')
-md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195'
+	'arch32-nssdatabases'
+	'fix-bash-completion.patch')
+md5sums=('f6b1badef213ce8e9ef37bb3fc213390'
          'a8d77cac806a0a9adef3f93cdbeb280a'
          '1e34db5387c4e5de911e15d8a9208bdb'
          '5a3f7b839c7e0b8933748da7c5b6385b'
          '06db41d42f9fce5449a28feb76ded556'
          'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
+         'af1da6edd8c8c0dafeeb2c2c4e0c840b'
+	 '5ba775d4f401e2c167414caa548b71e5')
 
 build() {
 	cd ${pkgname}-${pkgver}
+	patch -p1 -i ${srcdir}/fix-bash-completion.patch
 	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
 	./configure \
 		--prefix=/usr \
diff --git a/community/schroot/fix-bash-completion.patch b/community/schroot/fix-bash-completion.patch
new file mode 100644
index 000000000..fb22fd92d
--- /dev/null
+++ b/community/schroot/fix-bash-completion.patch
@@ -0,0 +1,11 @@
+--- a/etc/bash_completion/schroot
++++ b/etc/bash_completion/schroot
+@@ -15,7 +15,7 @@
+ # along with this program.  If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-have schroot &&
++_have schroot &&
+ _schroot()
+ {
+     local cur prev options