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

Conflicts:
	community/gtypist/PKGBUILD
	community/jack2/PKGBUILD
	community/linux-tools/PKGBUILD
	community/udevil/PKGBUILD
	extra/ntp/PKGBUILD
	extra/pulseaudio/PKGBUILD

7 files changed, 51 insertions, 59 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 67dd75224..a280cc4ad 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -2,26 +2,23 @@
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
-pkgver=a11
-_pkgver=0.0.11-alpha
+pkgver=a12
+_pkgver=0.0.12-alpha
 pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
-url="http://wildfiregames.com/0ad"
+url="http://play0ad.com/"
 license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data')
-makedepends=('boost' 'cmake' 'mesa')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-        "boost-1.50.patch")
-md5sums=('0feedd076ea441ca821073b4b7014946'
-         '570724341102e23730de2f70d3a1b97c')
+depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
+md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
 
 build() {
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
 
   sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
   sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  #patch -d ../.. -Np1 < $srcdir/boost-1.50.patch
 
   ./update-workspaces.sh \
       --with-system-enet \
diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD
index 8ec2e0d1d..d6b032ec1 100644
--- a/community/astromenace/PKGBUILD
+++ b/community/astromenace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78708 2012-10-23 00:34:23Z svenstaro $
+# $Id: PKGBUILD 81338 2012-12-18 09:30:27Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Ivan Bobrov <ibobrik at gmail dot com>
 # Contributor: Black_Mage <vleon1 at gmail dot com>
 
 pkgname=astromenace
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,9 +13,9 @@ url="http://www.viewizard.com/astromenace/index_linux.php"
 license=('GPL3')
 depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu' 'freetype2' 'libxinerama')
 makedepends=('cmake' 'mesa')
-source=(http://downloads.sourceforge.net/openastromenace/openastromenace-src-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/openastromenace/astromenace-src-$pkgver.tar.bz2
         astromenace.desktop)
-md5sums=('f48385106da687c12996d25852191e76'
+md5sums=('b2c69deed1708ec25d3fbec0b49f64d8'
          '1edc9367564a6c639a2b8199adf26a08')
 
 build() {
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 54a22ddfe..b96e6215b 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78662 2012-10-22 14:00:29Z tredaelli $
+# $Id: PKGBUILD 81351 2012-12-18 11:49:48Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bitcoin.org/"
@@ -13,7 +13,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 license=('MIT')
 source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('431d28cedc76999131fcb34fd7fac2be72e8fa0d0817f1af025569cb3dff7c55')
+sha256sums=('23d44161670c521f2aba64f9351b42260baa6bb2981640617c8e2e7683e5855c')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index e354bffa0..b5fe36364 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59675 2011-11-29 10:07:33Z spupykin $
+# $Id: PKGBUILD 81342 2012-12-18 09:40:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ben Mazer <blm@groknil.org>
 # Contributor: Mike Douglas <code_monkey@gooeylinux.org>
 
 pkgname=gtypist
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="universal typing tutor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('emacs')
 install=gtypist.install
 source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
 	ncurses.patch)
-md5sums=('99747f4e8d56c840a23a07145f798e54'
+md5sums=('e6f5ce16d3bdb335f7c698957bc54526'
          'ba5e990d948ba5019391094dac890aa6')
 
 build() {
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 3611b9eca..d3e1155a9 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77160 2012-10-06 07:11:43Z schiv $
+# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,25 +8,21 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.8
-pkgrel=4
+pkgver=1.9.9.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
-             'libsamplerate' 'dbus-core' 'celt')
-[ "$CARCH" = "mips64el" ] && \
-makedepends=('python2' 'doxygen'
-             'libsamplerate' 'dbus-core' 'celt')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
+makedepends=('python2' 'celt'
+             'libsamplerate' 'dbus-core')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libffado')
+source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
+        '40-hpet-permissions.rules')
+md5sums=('6c9de6b89db9d7076fa2ce222816cf4c'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         '1502d82fe2276d6f224fff6467a0b6f9')
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 _pyfix() {
   sed -i 's:bin/env python:bin/env python2:' \
@@ -41,8 +37,10 @@ _wafconf() {
   fi
   python2 waf configure --prefix=/usr \
                         --alsa \
-                        $firewire \
-                        --doxygen $@
+                        --firewire $@
+
+  # not building with doxygen
+  # see https://github.com/jackaudio/jack2/issues/22
 }
 
 _isbuild() {
@@ -50,15 +48,7 @@ _isbuild() {
 }
 
 build() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack2/commit/96e0251
-  (
-  cd $_tarname-$pkgver
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
-  )
+  cd "$srcdir"
 
   # Some optimisation bug exists for current GCC
   # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
@@ -66,7 +56,8 @@ build() {
   export CXXFLAGS="$CFLAGS"
 
   # fix doxygen building
-  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
+  # TODO: report upstream, but redundant until gihub issue 22 resolves
+  #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
 
   # we may do 2 different builds
   cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
@@ -104,7 +95,7 @@ package_jack2() {
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -132,7 +123,7 @@ package_jack2-dbus() {
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 684e721d3..721ad8ed5 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 78493 2012-10-19 20:57:01Z foutrelis $
+# $Id: PKGBUILD 81365 2012-12-18 19:53:30Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=1.0.13
+pkgver=1.0.15
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libmemcached.org/"
 license=('GPL')
 depends=('glibc' 'libsasl' 'libevent')
-makedepends=('perl' 'python-sphinx')
+makedepends=('perl' 'memcached')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('41efd1b5e1a8839ebe6c51714ae013f1a4b547bee0973cd8d87cdebdefdc4b28')
+sha256sums=('dd7e9560029835bddf761a5b4c2339d9e5c7374558659b6c11b2c95e7d3a4325')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # memcached is needed only in `make test', therefore we pass
-  # --without-memcached to the configure script to skip it
-  ./configure --prefix=/usr --without-memcached
+  ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -k check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 250640920..70de4c9c7 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81184 2012-12-12 20:04:46Z bpiotrowski $
+# $Id: PKGBUILD 81359 2012-12-18 17:43:40Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 
 pkgname=udevil
-pkgver=0.3.5
-pkgrel=2
+pkgver=0.3.6
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Mount and unmount without password'
 url='http://ignorantguru.github.com/udevil/'
@@ -23,7 +23,7 @@ provides=('devmon')
 backup=('etc/udevil/udevil.conf')
 install=$pkgname.install
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('0acb03c85f06fc8b59c6997830613529')
+md5sums=('522a06a2af81d36f2b9d6a8bd31fa88d')
 
 build() {
     cd $srcdir/$pkgname-$pkgver