Thu Aug 22 02:58:39 PDT 2013

14 files changed, 106 insertions, 137 deletions

diff --git a/community/caps/PKGBUILD b/community/caps/PKGBUILD
index 9ee7e291e..b6000f4fa 100644
--- a/community/caps/PKGBUILD
+++ b/community/caps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 96214 2013-08-21 19:31:33Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=caps
-pkgver=0.9.8
+pkgver=0.9.10
 pkgrel=1
 pkgdesc="The LADSPA C* Audio Plugin Suite"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL3')
 groups=('ladspa-plugins')
 depends=('ladspa')
 source=("http://quitte.de/dsp/caps_$pkgver.tar.bz2")
-md5sums=('e3bfcb4c53670dcc3c8ba3ce3639d002')
+md5sums=('dac87bf3a967b6f6ddcea1d90b6f4808')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD
index 5967ecc4f..53dc19714 100755
--- a/community/higan-gtk/PKGBUILD
+++ b/community/higan-gtk/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 95926 2013-08-18 22:26:48Z alucryd $
+# $Id: PKGBUILD 96210 2013-08-21 19:09:14Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-gtk
 pkgver=093
-pkgrel=1
+pkgrel=2
 pkgdesc="Nintendo multi-system emulator - GTK version"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/higan/"
 license=('GPL3')
 depends=('libao' 'libpulse' 'libxv' 'openal' 'sdl' 'xdialog')
-makedepends=('mesa')
+makedepends=('gendesk' 'mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-qt')
 source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz"
         "http://higan.googlecode.com/files/purify_v03-source.tar.xz"
-        'higan'
-        'higan.desktop'
-        'purify.desktop')
-sha1sums=('a1a117159a9c2c6b10a239b870479f520e45408d'
-          '2aa16f492c879d2cc1d4ffa28f4729a5ed5bb1c3'
-          '931baedc3bbdd343d2decda72c13b7d0efdcba3c'
-          '55f4de0a65d6428840d013f9b003d88158c131c7'
-          '093643998a2fb676d795c316e35d49cf6293ce86')
+        'higan')
+sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538'
+            '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38'
+            'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
 _profiles="accuracy balanced performance"
 
 prepare() {
+  gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u'
+  gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify'
+
   cd higan_v${pkgver}-source
 
   sed -i "s/flags   += -I. -O3 -fomit-frame-pointer/flags   += -I. -fomit-frame-pointer -std=gnu++11/
@@ -33,46 +32,48 @@ prepare() {
 }
 
 build() {
-# Compile libananke
-  cd "${srcdir}"/higan_v${pkgver}-source/ananke
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11"
-
-# Compile higan
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# libananke
+  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke
+
+# higan
   for _profile in ${_profiles}; do
     make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile}
-    mv out/higan out/higan-${_profile}
+    mv out/higan{,-${_profile}}
     make clean
   done
 
-# Compile purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
   make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic'
 }
 
 package() {
-# Install common files
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# Common files
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
-  install -m 755 ../higan "${pkgdir}"/usr/bin/higan
-  install -m 644 ../higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
+  install -m 755 {..,"${pkgdir}"/usr/bin}/higan
+  install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop
   install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png
   cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
   cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
-# Install libananke
+# libananke
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
-  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
+  ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-# Install higan
-  for _profile in ${_profiles} ; do
-    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
+# higan
+  for _profile in ${_profiles}; do
+    install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
   done
 
-# Install purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 purify "${pkgdir}"/usr/bin/purify
-  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
+  install -m 755 {,"${pkgdir}"/usr/bin/}purify
+  install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop
+  ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png
 
 # Fix permissions
   find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
diff --git a/community/higan-gtk/higan.desktop b/community/higan-gtk/higan.desktop
deleted file mode 100755
index c9cd3c14b..000000000
--- a/community/higan-gtk/higan.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=higan
-Comment=Nintendo multi-system emulator
-Exec=higan %u
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/community/higan-gtk/purify.desktop b/community/higan-gtk/purify.desktop
deleted file mode 100755
index 354dc2849..000000000
--- a/community/higan-gtk/purify.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=purify
-Comment=ROM purifier
-Exec=/usr/bin/purify
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
index 3b824b5f4..212caebf4 100755
--- a/community/higan-qt/PKGBUILD
+++ b/community/higan-qt/PKGBUILD
@@ -1,87 +1,84 @@
-# $Id: PKGBUILD 95928 2013-08-18 22:47:02Z alucryd $
+# $Id: PKGBUILD 96212 2013-08-21 19:22:00Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-qt
 pkgver=093
-pkgrel=1
+pkgrel=2
 pkgdesc="Nintendo multi-system emulator - Qt version"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/higan/"
 license=('GPL3')
 depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog')
-makedepends=('mesa')
+makedepends=('gendesk' 'mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-gtk')
 source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz"
         "http://higan.googlecode.com/files/purify_v03-source.tar.xz"
-        'higan'
-        'higan.desktop'
-        'purify.desktop')
+        'higan')
 sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538'
             '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38'
-            'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048'
-            'e9daf06d65fc95e3bfca4e9b9953dcc16830014ba895053c5553d5972031ffbc'
-            '5f24cc7884d19721b6f9ad14c14a98347de209a2791f4c830be83bd032f693f8')
+            'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
 _profiles="accuracy balanced performance"
 
 prepare() {
+  gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u'
+  gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify'
+
   cd "${srcdir}"/higan_v${pkgver}-source
 
-# Qt 4.8 fix
   moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
-
-# Use $CXXFLAGS
   sed -i "s/flags   += -I. -O3 -fomit-frame-pointer/flags   += -I. -fomit-frame-pointer -std=gnu++11/
           s/flags += -march=native/flags += $CXXFLAGS/g" Makefile
 
   cd "${srcdir}"/purify_v03-source
 
-# Qt 4.8 fix
   moc-qt4 -i -Ipurify/phoenix/qt/ -o purify/phoenix/qt/platform.moc purify/phoenix/qt/platform.moc.hpp
 }
 
 build() {
-# Compile libananke
-  cd "${srcdir}"/higan_v${pkgver}-source/ananke
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11"
-
-# Compile higan
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# libananke
+  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke
+
+# higan
   for _profile in ${_profiles}; do
     make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile}
-    mv out/higan out/higan-${_profile}
+    mv out/higan{,-${_profile}}
     make clean
   done
 
-# Compile purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
   make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic'
 }
 
 package() {
-# Install common files
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# Common files
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
-  install -m 755 ../higan "${pkgdir}"/usr/bin/higan
-  install -m 644 ../higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
+  install -m 755 {..,"${pkgdir}"/usr/bin}/higan
+  install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop
   install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png
   cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
   cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
-# Install libananke
+# libananke
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
-  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
+  ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-# Install higan
-  for _profile in ${_profiles} ; do
-    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
+# higan
+  for _profile in ${_profiles}; do
+    install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
   done
 
-# Install purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 purify "${pkgdir}"/usr/bin/purify
-  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
+  install -m 755 {,"${pkgdir}"/usr/bin/}purify
+  install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop
+  ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png
 
 # Fix permissions
   find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
diff --git a/community/higan-qt/higan.desktop b/community/higan-qt/higan.desktop
deleted file mode 100755
index c9cd3c14b..000000000
--- a/community/higan-qt/higan.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=higan
-Comment=Nintendo multi-system emulator
-Exec=higan %u
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/community/higan-qt/purify.desktop b/community/higan-qt/purify.desktop
deleted file mode 100755
index 354dc2849..000000000
--- a/community/higan-qt/purify.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=purify
-Comment=ROM purifier
-Exec=/usr/bin/purify
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 0f935a956..3dc14a894 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94033 2013-07-13 12:34:05Z svenstaro $
+# $Id: PKGBUILD 96182 2013-08-21 06:12:24Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,14 +6,14 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.5
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8') doesn't work
-makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl') doesn't work
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8')
+makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl')
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
 backup=('etc/mongodb.conf')
@@ -37,8 +37,8 @@ build() {
     --use-system-tcmalloc \
     --ssl \
     --sharedclient
-    # --use-sasl-client doesn't work
-    # --use-system-v8 doesn't work
+    # --use-system-v8
+    # --use-sasl-client
 }
 
 <<COMMENT
@@ -65,8 +65,8 @@ package() {
     --sharedclient \
     --full \
     --prefix="$pkgdir/usr"
-    # --use-sasl-client doesn't work
-    # --use-system-v8 doesn't work
+    # --use-system-v8
+    # --use-sasl-client
 
   rm "$pkgdir/usr/lib/libmongoclient.a"
 
@@ -76,7 +76,7 @@ package() {
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('07a46770c5acc0e046750e0299e669b934f6093705f5979bc5fa8bb56e73761f9602a5bdbaaad688700e4dde32d1e5f48a6cf3763ffab4d80a47f0158d8fb89e'
+sha512sums=('73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index a260a4cf8..30e2d1cf6 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95879 2013-08-18 05:35:59Z fyan $
+# $Id: PKGBUILD 96180 2013-08-21 03:24:34Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.2a.20130818
-_commit=de2af3f13e664af0e05a197cc2bd073edffaf235
-pkgrel=2
+pkgver=0.2a.20130820
+_commit=895fdf5248c5d69f797220b7df36df1d5bf2709a
+pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64')
 url="https://github.com/xiehuc/pidgin-lwqq"
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index de2f8473d..5a38e785c 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96071 2013-08-19 20:07:31Z eric $
+# $Id: PKGBUILD 96184 2013-08-21 12:27:48Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=poedit
 pkgver=1.5.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64')
 url="http://www.poedit.net/"
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 4278a2596..94cb0a7e5 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90613 2013-05-13 10:55:37Z spupykin $
+# $Id: PKGBUILD 96186 2013-08-21 12:28:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.0@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgname=prosody
-pkgver=0.8.2
-pkgrel=9
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
 arch=('i686' 'x86_64')
 url="http://prosody.im/"
@@ -20,9 +20,9 @@ source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
 	'fix-config.patch'
 	'prosody.tmpfile.d'
 	'prosody.service')
-md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
+md5sums=('cf0dd4f3389ab666d2d2b3a43464afc4'
          '5b44aee99f1fa9e7f055e067688cafbd'
-         'a4a5b968b5809037f83465c571eb9afe'
+         'a21d6a6efef8a08ae21109c2aa9c2fc7'
          'e2f5a1df410b05696a30dcb058841084'
          'e74045f27cb60908d535969906781f75')
 
diff --git a/community/prosody/fix-config.patch b/community/prosody/fix-config.patch
index 3d01fd88a..9b837c85b 100644
--- a/community/prosody/fix-config.patch
+++ b/community/prosody/fix-config.patch
@@ -1,32 +1,34 @@
-diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist	2011-04-05 13:47:06.000000000 +0000
-+++ prosody-0.8.0.my/prosody.cfg.lua.dist	2011-04-07 16:03:42.000000000 +0000
-@@ -21,6 +21,8 @@
- -- (see http://prosody.im/doc/creating_accounts for info)
- -- Example: admins = { "user1@example.com", "user2@example.net" }
- admins = { }
+diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.dist
+--- prosody-0.9.0.q/prosody.cfg.lua.dist	2013-08-19 23:37:36.000000000 +0400
++++ prosody-0.9.0/prosody.cfg.lua.dist	2013-08-21 16:17:49.175521891 +0400
+@@ -11,6 +11,8 @@
+ -- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+ -- blanks. Good luck, and happy Jabbering!
+ 
 +daemonize = true
 +pidfile = "/run/prosody/prosody.pid"
  
- -- Enable use of libevent for better performance under high load
- -- For more information see: http://prosody.im/doc/libevent
-@@ -59,7 +61,7 @@
- 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+ ---------- Server-wide settings ----------
+ -- Settings in this section apply to the whole server and are the default settings
+@@ -63,7 +65,7 @@
+ 		--"http_files"; -- Serve static files from a directory over HTTP
  
  	-- Other specific functionality
 -		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 +		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
  		--"groups"; -- Shared roster support
-@@ -123,8 +125,8 @@
+ 		--"announce"; -- Send announcement to all online users
+ 		--"welcome"; -- Welcome users who register accounts
+@@ -139,9 +141,9 @@
  -- Logging configuration
  -- For advanced logging see http://prosody.im/doc/logging
  log = {
 -	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
 -	error = "prosody.err";
-+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+	error = "/var/log/prosody/prosody.err";
- 	-- "*syslog"; -- Uncomment this for logging to syslog
+-	-- "*syslog"; -- Uncomment this for logging to syslog
++	-- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	-- error = "prosody.err";
++	"*syslog"; -- Uncomment this for logging to syslog
  	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
  }
+ 
diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install
index 792681038..a77801d7b 100644
--- a/community/prosody/prosody.install
+++ b/community/prosody/prosody.install
@@ -16,6 +16,7 @@ post_install() {
 
 post_upgrade() {
     post_install $1
+    echo "Now prosody logs to syslog by default"
 }
 
 post_remove() {
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 56e6020e5..d03574675 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 92176 2013-06-02 12:35:50Z arodseth $
+# $Id: PKGBUILD 96198 2013-08-21 15:11:15Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgbase=python-pymongo
 pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.5.2
+pkgver=2.6
 pkgrel=1
 pkgdesc='Python driver for MongoDB'
 arch=('x86_64' 'i686')
 license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
-makedepends=('python-distribute' 'python2-distribute')
+makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('84ac1da67d0dabc711fa8259324d4e94b26a85411bcf0c12dc80a427d9f93ecc')
+sha256sums=('0397584348e5b9efa678878ef686ea3bb77f9b83e634480033ce67467d43675a')
 
 build() {
   cd "$srcdir"