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

Conflicts:
	community/erlang/PKGBUILD
	community/mcabber/PKGBUILD
	community/smem/PKGBUILD
	community/uqm/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/gweled/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/sdl_sound/PKGBUILD
	extra/xmms/PKGBUILD
	libre/gnu-ghostscript/PKGBUILD
	libre/libretools/PKGBUILD

20 files changed, 241 insertions, 163 deletions

diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index d8ae0e53b..c1bfcb752 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 69800 2012-04-23 09:46:22Z ibiru $
+# $Id: PKGBUILD 79595 2012-11-08 15:28:22Z heftig $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
 pkgver=2.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clanlib.org/"
 license=('zlib')
-depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite')
+depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite')
 makedepends=('doxygen' 'graphviz')
 options=('!libtool')
 source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index cd0c4a365..aefe2109a 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74372 2012-07-25 22:55:20Z lfleischer $
+# $Id: PKGBUILD 79601 2012-11-08 19:11:56Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.5.5
-pkgrel=2
+pkgver=0.5.6
+pkgrel=1
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://deadbeef.sourceforge.net'
@@ -32,7 +32,7 @@ optdepends=('libsamplerate: for Resampler plugin'
 options=('!libtool')
 install='deadbeef.install'
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7cc10cefda0f4044eea897893e4cc1a9')
+md5sums=('26b6036ca7e59c88267d3de4f42c4d01')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 5a2369599..d365fe5ce 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,78 +1,55 @@
-# $Id: PKGBUILD 77628 2012-10-13 11:41:57Z allan $
-# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
+# $Id: PKGBUILD 79610 2012-11-08 22:16:13Z lfleischer $
+# Maintainer:  Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
+# Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang
-pkgver=R15B01
-pkgrel=2
-pkgdesc='A small concurrent functional programming language developed by Ericsson.'
+pkgver=R15B02
+pkgrel=1
+pkgdesc='A general-purpose concurrent functional programming language developed by Ericsson'
 arch=(i686 x86_64 mips64el)
-url='http://www.erlang.org/index.html'
+url='http://www.erlang.org'
 license=('custom')
 depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa' 'glu')
-optdepends=('wxgtk: for wx support'
-            'glu: for wx support'
-            'unixodbc: database'
-            'java-environment: for Java support')
-if [ "$CARCH" = "mips64el" ]; then 
-makedepends=('perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
+makedepends=('perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa')
 optdepends=('wxgtk: for wx support'
             'mesa: for wx support'
-            'unixodbc: database')
+            'unixodbc: for database support')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('java-environment')
+  optdepends+=('java-environment: for Java support')
 fi
-options=('!makeflags' '!distcc')
-source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz"
-        "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz")
-md5sums=('f12d00f6e62b36ad027d6c0c08905fad'
-         'd87412c2a1e6005bbe29dfe642a9ca20')
+source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
+        "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
+md5sums=('ccbe5e032a2afe2390de8913bfe737a1'
+         '974020ba533242fca759a7f5eaf628e5')
 
 build() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-
-  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
-  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \
-    lib/erl_interface/vsn.mk)
-
-  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
+  cd "$srcdir/otp_src_$pkgver"
 
-  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \
-    --enable-threads
+  ./configure --prefix=/usr --enable-smp-support
   make
 }
 
 package() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-
-  make INSTALL_PREFIX="$pkgdir" install
-
-  # fix prefix
-  cd "$pkgdir/usr/lib/erlang"
-  sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \
-    "erts-${ERTSVERSION}/bin/start" releases/RELEASES
+  cd "$srcdir/otp_src_$pkgver"
 
-  # fix symlinks
-  cd bin/
-  ln -sf "../erts-${ERTSVERSION}/bin/epmd"
+  make DESTDIR="$pkgdir" install
 
-  cd "$pkgdir/usr/bin"
-  for file in *; do
-    ln -sfv "../lib/erlang/bin/$file"
-  done
-
-  ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \
-    "$pkgdir/usr/bin/erl_call"
-
-  # install documentation
+  # Install documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
+  install -m0644 "$srcdir/otp_src_$pkgver"/README.md "$srcdir"/{README,COPYRIGHT} \
+    "$pkgdir/usr/share/doc/erlang"
 
-  # install man pages
+  # Install compressed man pages
+  for page in "$srcdir/man/man?/*"; do
+    gzip $page
+  done
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
-  # install license
-  install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \
+  # Install license
+  install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD
new file mode 100644
index 000000000..e28e6d131
--- /dev/null
+++ b/community/keybinder2/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+pkgname=('libkeybinder2' 'python2-keybinder2')
+pkgbase=keybinder2
+_offname=keybinder
+pkgver=0.3.0
+pkgrel=1
+pkgdesc='Library for registering global keyboard shortcuts'
+arch=('i686' 'x86_64')
+url='http://kaizer.se/wiki/keybinder/'
+license=('GPL')
+makedepends=('pygtk')
+options=(!libtool)
+source=(http://kaizer.se/publicfiles/${_offname}/${_offname}-${pkgver}.tar.gz)
+sha256sums=('42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb')
+
+build() {
+  cd "${srcdir}/${_offname}-${pkgver}"
+  export PYTHON=/usr/bin/python2
+  ./configure \
+        --prefix=/usr \
+        --disable-lua
+  make
+}
+
+package_libkeybinder2() {
+  pkgdesc='Library for registering global keyboard shortcuts'
+  depends=('gtk2')
+
+  cd "${srcdir}/${_offname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+  rm -rf ${pkgdir}/usr/lib/python2.7
+}
+
+package_python2-keybinder2() {
+  pkgdesc='Library for registering global keyboard shortcuts - Python 2 bindings'
+  depends=('libkeybinder2' 'pygtk')
+  provides=('python-keybinder')
+
+  cd "${srcdir}/${_offname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+  rm -rf ${pkgdir}/usr/lib/{girepository-1.0,libkeybinder*,pkgconfig}
+  rm -rf ${pkgdir}/usr/{include,share}
+}
diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD
index 7841831ab..4c6923e21 100644
--- a/community/mcabber/PKGBUILD
+++ b/community/mcabber/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 66233 2012-02-23 05:07:48Z spupykin $
+# $Id: PKGBUILD 79621 2012-11-09 00:24:34Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor:  3ED <kas1987@o2.pl>
 
 pkgname=mcabber
 pkgver=0.10.1
-pkgrel=2
-pkgdesc="a small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
+pkgrel=4
+pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lilotux.net/~mikael/mcabber/"
 license=('GPL')
-depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell')
-makedepends=('pkgconfig')
+depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr3' 'aspell')
+makedepends=('pkg-config')
 options=('!libtool')
 source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2)
 md5sums=('fe96beab30f535d5d6270fd1719659b4')
 
 build() {
-  cd ${srcdir}/$pkgname-${pkgver/_/-}
+  cd "${srcdir}"/$pkgname-${pkgver/_/-}
+
+  sed -i 's|lotr|lotr3|' configure
+  sed -i 's|libotr/version.h|libotr3/version.h|' configure
+  sed -i 's|#include <libotr|#include <libotr3|' mcabber/otr.h
 
   ./configure --prefix=/usr --enable-hgcset \
       --mandir=/usr/share/man \
@@ -26,12 +30,12 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-${pkgver/_/-}
+  cd "${srcdir}"/$pkgname-${pkgver/_/-}
 
-  make DESTDIR=${pkgdir} install
-  mkdir -p ${pkgdir}/usr/share/mcabber/example
+  make DESTDIR="${pkgdir}" install
+  mkdir -p "${pkgdir}"/usr/share/mcabber/example
   msg "Copying mcabberrc.example to usr/share/mcabber/example/mcabberrc"
-  cp -a ${srcdir}/$pkgname-${pkgver/_/-}/mcabberrc.example \
-	${pkgdir}/usr/share/mcabber/example/mcabberrc
+  cp -a "${srcdir}"/$pkgname-${pkgver/_/-}/mcabberrc.example \
+	"${pkgdir}"/usr/share/mcabber/example/mcabberrc
 }
 
diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD
index 694a30ae6..73f13fce9 100644
--- a/community/mingw32-gcc-base/PKGBUILD
+++ b/community/mingw32-gcc-base/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 76624 2012-09-25 09:56:18Z spupykin $
+# $Id: PKGBUILD 79594 2012-11-08 15:25:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc-base
-pkgver=4.7.0
+pkgver=4.7.2
 _w32apiver=3.17
 _runtimever=3.20
 _uprel=1
 _upw32rel=1
-pkgrel=2
+pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="A C cross-compiler for building Windows executables on Linux"
 depends=(mingw32-binutils)
@@ -21,7 +21,7 @@ source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge
 	    http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma
         http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz
         gcc-1-mingw-float.patch)
-md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d'
+md5sums=('bc2d1828dd6c53683600545ca6a901e1'
          '89e5800096aa334009f98e7c1743d825'
          '26c0886cc60729b94956cc6d81cd076c'
          '2407123c35c0aa92ee5ffc27decca9a7')
diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
index e782b7643..b3c07a59b 100644
--- a/community/mingw32-gcc/PKGBUILD
+++ b/community/mingw32-gcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75205 2012-08-16 01:56:28Z allan $
+# $Id: PKGBUILD 79591 2012-11-08 15:24:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc
-pkgver=4.7.0
-pkgrel=2
+pkgver=4.7.2
+pkgrel=1
 _uprel=1
 arch=(i686 x86_64 mips64el)
 pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
@@ -17,7 +17,7 @@ url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/"
 license=(GPL LGPL)
 source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
         gcc-1-mingw-float.patch)
-md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d'
+md5sums=('bc2d1828dd6c53683600545ca6a901e1'
          '2407123c35c0aa92ee5ffc27decca9a7')
 
 build()
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index ae9e07fad..a730c20b3 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,35 +1,31 @@
-# $Id: PKGBUILD 75300 2012-08-18 10:30:18Z lfleischer $
+# $Id: PKGBUILD 79619 2012-11-08 23:54:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
-pkgver=5.0
-pkgrel=2
+pkgver=5.0.1
+pkgrel=1
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ntop.org/'
 license=('GPL')
 depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
-makedepends=('subversion' 'ca-certificates')
+makedepends=('subversion' 'wget' 'ca-certificates')
 options=('!libtool' '!makeflags')
 install='ntop.install'
 source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
         'ntop'
         'ntop.conf.d'
         'ntop.service')
-md5sums=('e4115a6609fd2def2dce177772f9a789'
+md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
          '7b0d7bb57432e768ff387e9f7236f87c'
          '6a9371de1dcf31d8ef13a4cf349c02b3'
-         'bcb2bcfb4b573babdee7d9321591e3e3')
+         '0e149d20f881600e8387d850ac268483')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  echo 't' | svn export -r 5614 'https://svn.ntop.org/svn/ntop/trunk/nDPI/'
-  tar -czvf nDPI-svn5614.tar.gz nDPI
-
-  ./autogen.sh --noconfig
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp
   make
 }
 
diff --git a/community/ntop/ntop.service b/community/ntop/ntop.service
index 20a9c66f9..c18a2c83a 100644
--- a/community/ntop/ntop.service
+++ b/community/ntop/ntop.service
@@ -6,7 +6,7 @@ After=syslog.target network.target
 
 [Service]
 Environment=LANG=C
-ExecStart=/usr/sbin/ntop -i eth0 -w 3000
+ExecStart=/usr/bin/ntop -i eth0 -w 3000
 Type=simple
 StandardError=syslog
 
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index 14b67ce63..4953c40fe 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 79210 2012-10-31 22:50:00Z tomegun $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 79612 2012-11-08 22:16:52Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pdns-recursor
 pkgver=3.3
-pkgrel=2
-pkgdesc="PowerDNS recursor"
-url="http://www.powerdns.com"
+pkgrel=3
+pkgdesc='PowerDNS recursor'
+url='http://www.powerdns.com'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 depends=('gcc-libs' 'lua')
 makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2"
-        'pdns-recursor.rc')
-md5sums=('87daeeebb6f7af9e07814ff6c43300dd'
-         '5b3aa3c8ed2edf55821af16cfb7ef252')
+source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
+        'pdns-recursor.rc'
+	'pdns-recursor.service')
+sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc'
+            '7ff45a2da128e82da409f123f8346cc085b57337d6d44a9fd76d17024898b1ca'
+            'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
   LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/etc/rc.d"
-  mv "${pkgdir}/etc/powerdns/recursor.conf-dist" "${pkgdir}/etc/powerdns/recursor.conf"
-  install -m755 "${srcdir}/pdns-recursor.rc" "${pkgdir}/etc/rc.d/pdns-recursor"
-  rm -rf "${pkgdir}/etc/init.d"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -d -m755 "$pkgdir/etc/rc.d"
+  mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf"
+  install -m755 "$srcdir/pdns-recursor.rc" "$pkgdir/etc/rc.d/pdns-recursor"
+  rm -r "$pkgdir/etc/init.d"
+  install -Dm644 "$srcdir/pdns-recursor.service" \
+    "$pkgdir/usr/lib/systemd/system/pdns-recursor.service"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pdns-recursor/pdns-recursor.service b/community/pdns-recursor/pdns-recursor.service
new file mode 100644
index 000000000..8f4404e1d
--- /dev/null
+++ b/community/pdns-recursor/pdns-recursor.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PowerDNS recursing nameserver
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pdns_recursor --daemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index dc886cf3c..ebfcc7fd2 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 79208 2012-10-31 22:28:28Z tomegun $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 79608 2012-11-08 22:00:36Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pdns
-pkgver=2.9.22.6
+pkgver=3.1
 pkgrel=1
-pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
-arch=('i686' 'x86_64')
-url="http://www.powerdns.com"
+pkgdesc="Modern, advanced and high performance authoritative-only nameserver"
+arch=('x86_64' 'i686')
+url='http://www.powerdns.com/'
 license=('GPL')
-depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap')
+depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua' 'boost-libs')
 makedepends=('boost')
 provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
@@ -16,28 +17,27 @@ conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 install=pdns.install
 options=('!makeflags' '!libtool')
 backup=('etc/powerdns/pdns.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz"
-        '2.9.18-default-mysql-options.patch'
-        'pdns-2.9.22-gcc44.patch'
+source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
+        'pdns.service'
         'pdns.rc'
         'pdns.conf')
-md5sums=('ff97ba980b322adb61c3e9c9e9c4adef'
-         '90fb32e843326d14359c508cef855929'
-         '530642273005bdabae27792098834ea6'
-         '16e2d32e9781be7afa8f1700740bcdb0'
-         'a390ab49c4fcde205629be33bddc2e6c')
+sha256sums=('1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434951970217d9af06922a1'
+            '2a60c4407bcfe19026ae77d3e3b7b477d5a0c6323c0bc78892e9d907003b442a'
+            '0457ffa2baa40518a03393e4f76964d9452c16aebbcb925582814f88367d62c2'
+            'e3de30584436a063cdff4b4ca77044da06a0737fc333847b3da89370cf763c0c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/2.9.18-default-mysql-options.patch"
-  patch -p1 -i "${srcdir}/pdns-2.9.22-gcc44.patch"
+  cd "$srcdir/$pkgname-$pkgver"
+
   touch AUTHORS NEWS
   libtoolize --force --copy
   aclocal
   autoconf
   automake --add-missing
+  sed -i 's/BOOST/#BOOST/g' configure
   ./configure --prefix=/usr \
     --sysconfdir=/etc/powerdns \
+    --with-boost \
     --libexecdir=/usr/lib \
     --libdir=/usr/lib/powerdns \
     --mandir=/usr/share/man \
@@ -45,14 +45,20 @@ build() {
     --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
     --disable-recursor \
     --disable-static
-  make
+  make \
+    CXXFLAGS="-lboost_graph_parallel -lboost_serialization -lboost_program_options $CXXFLAGS"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  rm "${pkgdir}/etc/powerdns/pdns.conf-dist"
-  install -m644 "${srcdir}/pdns.conf" "${pkgdir}/etc/powerdns/"
-  install -m755 "${srcdir}/pdns.rc" "${pkgdir}/etc/rc.d/pdns"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -m755 -d "$pkgdir/etc/rc.d"
+  rm "$pkgdir/etc/powerdns/pdns.conf-dist"
+  install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/"
+  install -m755 "$srcdir/pdns.rc" "$pkgdir/etc/rc.d/pdns"
+  install -Dm644 "$srcdir/pdns.service" \
+    "$pkgdir/usr/lib/systemd/system/pdns.service"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pdns/pdns.service b/community/pdns/pdns.service
new file mode 100644
index 000000000..1005c9f64
--- /dev/null
+++ b/community/pdns/pdns.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=PowerDNS Authorative Server
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes
+ExecReload=/usr/bin/pdns_control cycle
+ExecStop=/usr/bin/pdns_control quit
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD
index 3cfaae4ac..38cfbd399 100644
--- a/community/pidgin-otr/PKGBUILD
+++ b/community/pidgin-otr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70766 2012-05-16 13:08:20Z lfleischer $
+# $Id: PKGBUILD 79622 2012-11-09 00:24:37Z ebelanger $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,17 +6,17 @@
 # Contributor: Marcel Wysocki <maci@satgnu.net>
 
 pkgname=pidgin-otr
-pkgver=3.2.1
+pkgver=4.0.0
 pkgrel=1
 pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.cypherpunks.ca/otr/'
-depends=('libotr>=3.2.0' 'pidgin' 'perlxml')
+depends=('libotr>=4.0.0' 'pidgin' 'perlxml')
 makedepends=('intltool')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc})
-md5sums=('4c3f73cca729555ff46c09e789ef6896'
-         'e9a6d699768bd888f086e697ad984aa7')
+md5sums=('eadb953376acc474e56041d4c12aa2c8'
+         '8c70a2fc6f5f0480f32178742ba96498')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index 68f04fa70..a0426cee3 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -7,15 +7,14 @@
 
 pkgname=('python-scipy' 'python2-scipy')
 pkgver=0.11.0
-pkgrel=2
+pkgrel=4
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
 makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
 checkdepends=('python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz")
-md5sums=('842c81d35fd63579c41a8ca21a2419b9')
+source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz")
 
 build() {
   unset LDFLAGS
@@ -30,7 +29,8 @@ build() {
 
   # build for python3
   cd scipy-${pkgver}
-  python setup.py config_fc --fcompiler=gnu95 build
+  patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
+  python3 setup.py config_fc --fcompiler=gnu95 build
 
   # build for python2
   cd ../scipy-${pkgver}-py2
@@ -59,7 +59,7 @@ package_python-scipy() {
 
   cd scipy-${pkgver}
 
-  python setup.py config_fc --fcompiler=gnu95 install \
+  python3 setup.py config_fc --fcompiler=gnu95 install \
     --prefix=/usr --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE.txt \
@@ -80,3 +80,5 @@ package_python2-scipy() {
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('842c81d35fd63579c41a8ca21a2419b9'
+         '20d41a597ebfb260d777597e431a7a20')
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 8ea69e0df..c94ac8ba3 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78861 2012-10-26 04:03:40Z svenstaro $
+# $Id: PKGBUILD 79620 2012-11-09 00:14:36Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.6.0rc
-_pkgver=2.6.0-rc
-pkgrel=2
+pkgver=2.6.0
+_pkgver=2.6.0
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/products/developer-tools'
@@ -28,7 +28,7 @@ optdepends=('qt-doc: for the integrated Qt documentation'
 install=qtcreator.install
 source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('df82e307dc9212fd69c1ee4e40501169'
+md5sums=('9bf01098f84a0fe930b2718d11124204'
          '5aa242e0262fa22f75c3b59d3a4ec198')
 
 build() {
diff --git a/community/rogue/PKGBUILD b/community/rogue/PKGBUILD
new file mode 100644
index 000000000..98de5901e
--- /dev/null
+++ b/community/rogue/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 79577 2012-11-08 06:32:13Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+pkgname=rogue
+pkgver=5.4.4
+pkgrel=2
+pkgdesc="The original dungeon crawl game."
+arch=('i686' 'x86_64')
+url="http://rogue.rogueforge.net/rogue-5-4/"
+license=('custom')
+depends=('ncurses')
+provides=('rouge')  # so the illiterate can find it in searches too
+#source=(http://rogue.rogueforge.net/files/rogue5.4/$pkgname$pkgver-src.tar.gz)
+source=(http://www.sourcefiles.org/Games/Role_Play/$pkgname$pkgver-src.tar.gz)
+md5sums=('033288f46444b06814c81ea69d96e075')
+
+build() {
+  cd "$srcdir/$pkgname$pkgver"
+  ./configure
+  make
+  install -Dm755 rogue "$pkgdir/usr/bin/rogue"
+  install -Dm644 rogue.6 "$pkgdir/usr/share/man/man6/rogue.6"
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE.TXT"
+}
+
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index 4bb48b41b..1a08853d5 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59733 2011-11-30 03:48:48Z dreisner $
+# $Id: PKGBUILD 79614 2012-11-08 22:44:40Z stephane $
 # Maintainer: Dave Reisner <d@falconindy.com>
 # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org>
 # Contributor: Sebastien Duquette <ekse.0x@gmail.com>
 
 pkgname=smem
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Generate reports on memory usage."
 url="http://www.selenic.com/smem/"
 license=("GPL")
 depends=('python2')
-optdepends=('python-matplotlib: for chart generation')
+optdepends=('python2-matplotlib: for chart generation')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz")
 md5sums=('5620f20cae4d4f0e8eb33bdc2736b0f3')
diff --git a/community/uqm/PKGBUILD b/community/uqm/PKGBUILD
index 79d3c0c74..4e1f2f037 100644
--- a/community/uqm/PKGBUILD
+++ b/community/uqm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65007 2012-02-19 17:51:46Z lcarlier $
+# $Id: PKGBUILD 79596 2012-11-08 15:28:33Z heftig $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Maintainer : Daenyth <Daenyth+Arch _AT_ gmail _DOT_ com>
 # Contributor : wizzomafizzo <wizzomafizzo@gmail.com>
@@ -7,12 +7,12 @@
 
 pkgname=uqm
 pkgver=0.7.0
-pkgrel=2
-pkgdesc="The Ur-Quan Masters is a port of Star Control 2"
+pkgrel=3
+pkgdesc="The Ur-Quan Masters, a port of Star Control 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sc2.sf.net/"
 license=('GPL')
-depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl')
+depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl' 'glu')
 makedepends=('imagemagick' 'mesa' 'namcap')
 optdepends=('uqm-sound: For extra music and conversation audio')
 source=(http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-source.tgz
@@ -24,26 +24,20 @@ source=(http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-source.tg
 noextract=(uqm-${pkgver}-content.uqm)
 md5sums=('f9018ea0493d7dac6a9e1006b00af7df'
          '2f36dcb15274dbbcb5e266f2ed84d5b2'
-         '07f0a0e74a0b1c706940cc43d5a4160c'
+         'ca497b754edf56aab8a5791f1d2c974a'
          '07e64632fce6323a14ab558d0214b885'
          '44c83b9b9d102b99210af0036749a318'
          '06d0a72aa18e7edce6cd3c7a3a747c44')
 
-build() {
+package() {
   cd $srcdir/$pkgname-$pkgver
   
   cp $srcdir/config.state .
   sed -e "/INPUT_install_prefix/ s|replaceme|$pkgdir/usr|" \
       -i config.state
-
-  echo | ./build.sh uqm config
+  ./build.sh uqm reprocess_config
 
   ./build.sh uqm
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
   ./build.sh uqm install
 
   install -Dm644 $srcdir/$pkgname-$pkgver-content.uqm \
diff --git a/community/uqm/config.state b/community/uqm/config.state
index 1568f4a24..bfbeedffb 100644
--- a/community/uqm/config.state
+++ b/community/uqm/config.state
@@ -7,6 +7,7 @@ CHOICE_netplay_VALUE='full'
 CHOICE_joystick_VALUE='enabled'
 CHOICE_ioformat_VALUE='stdio_zip'
 CHOICE_accel_VALUE='asm'
+CHOICE_threadlib_VALUE='sdl'
 INPUT_install_prefix_VALUE='replaceme'
 INPUT_install_bindir_VALUE='$prefix/bin'
 INPUT_install_libdir_VALUE='$prefix/lib'