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

Conflicts: community/botan/PKGBUILD community/qgo/PKGBUILD community/ragel/PKGBUILD extra/avahi/PKGBUILD extra/kdepim/PKGBUILD extra/libva/PKGBUILD extra/libwnck3/PKGBUILD extra/orc/PKGBUILD extra/python/PKGBUILD extra/python2/PKGBUILD extra/qt3/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-04-11 17:29:20 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-04-11 17:29:20 +0200
commit: 7a42705e87e0da5d2417b4293729e3ee1ae3b33c (patch)
tree: 04aa72c4fdff134e2c5ae9f539e092d5faafe808 /community
parent: e6ced89f44186539d8fedf73b62024aa2214230e (diff)
parent: 337402b957bab442da9e0d46ee7a8d8f32ede3ce (diff)
59 files changed, 1114 insertions, 388 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index c1a642e5f..d4aefca01 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87547 2013-04-02 21:52:23Z svenstaro $
+# $Id: PKGBUILD 87879 2013-04-08 12:35:31Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: AdriÃ¡n Chaves FernÃ¡ndez (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
 pkgver=a13
 _pkgver=0.0.13-alpha
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -21,10 +21,12 @@ build() {
   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"
 
+  unset CPPFLAGS
+
   ./update-workspaces.sh \
       --with-system-enet \
       --bindir=/usr/bin \
-      --libdir=/usr/lib \
+      --libdir=/usr/lib/0ad \
       --datadir=/usr/share/${pkgname}/data
 
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
@@ -33,9 +35,9 @@ build() {
 }
 
 package() {
-  install -d "${pkgdir}"/usr/{bin,lib}
+  install -d "${pkgdir}"/usr/{bin,lib/0ad}
   install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib"
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
 
   install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index f04a93557..f2169a2af 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $
+# $Id: PKGBUILD 87987 2013-04-09 21:29:15Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -30,9 +30,9 @@ build() {
  ./configure \
     --prefix=/usr \
     --mandir=$pkgdir/usr/share/man \
-    --with-qt-prefix=/opt/qt \
-    --with-qt-includes=/opt/qt/include \
-    --with-qt-libraries=/opt/qt/lib \
+    --with-qt-prefix=/usr \
+    --with-qt-includes=/usr/include/qt3 \
+    --with-qt-libraries=/usr/lib \
     --enable-oss
 
   make
diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD
index 73ab39fbf..caf945b04 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 83128 2013-01-27 16:10:24Z pierre $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: d'Ronin <daronin@2600.com>
 
 pkgname=botan
-pkgver=1.10.3
-pkgrel=1.1
-pkgdesc="Crypto library written in C++"
+pkgver=1.10.5
+pkgrel=1
+pkgdesc='Crypto library written in C++'
 license=('BSD')
-arch=('i686' 'x86_64' 'mips64el')
-url="http://botan.randombit.net/"
+arch=('x86_64' 'i686' 'mips64el')
+url='http://botan.randombit.net/'
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
-source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc})
-sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb'
-          'd03b220849e3d3b3a49363a0debc266b615d9fca')
+source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz")
+sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3')
 
 build() {
-  cd "${srcdir}/Botan-${pkgver}"
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
+  cd "$srcdir/Botan-$pkgver"
+
+  sed -i 's:env python:env python2:' configure.py
   sed -i 's/mabi=64/mabi=n32/g' src/build-data/cc/gcc.txt
   ./configure.py --prefix=/usr
   make 
 }
 
 package() {
-  cd "${srcdir}/Botan-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install
-  install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \;
+  cd "$srcdir/Botan-$pkgver"
+
+  make DESTDIR="$pkgdir/usr" install
+  install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \;
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index aa0375e4b..cedc5afba 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87592 2013-04-03 15:19:45Z spupykin $
+# $Id: PKGBUILD 87877 2013-04-08 12:24:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
@@ -16,7 +16,7 @@ options=('!libtool')
 backup=('etc/couchdb/local.ini'
 	'etc/conf.d/couchdb'
 	'etc/logrotate.d/couchdb')
-source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
+source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
 	"couchdb.service"
 	"couchdb.tmpfiles"
 	"couchdb.rc"
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index bf2509353..7042158ca 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86030 2013-03-11 13:36:02Z spupykin $
+# $Id: PKGBUILD 87838 2013-04-08 09:19:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.1.4
-_pkgver=1.1
+pkgver=1.2
+_pkgver=1.2
 pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,12 +19,10 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('49e376ca4b88f5351acacef177285c45')
+md5sums=('31bfd13d4786aac4f99d5155a811602b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  sed -i 's/-Werror//' src/CMakeLists.txt
   mkdir -p build
   cd build
   cmake \
@@ -42,6 +40,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
   mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
-#  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
-#  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
 }
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index 832be424c..77e0be961 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 76519 2012-09-21 13:30:51Z spupykin $
+# $Id: PKGBUILD 87840 2013-04-08 09:20:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Contributor: Gnud <ach.gnud@gmail.com>
 
 pkgname=denemo
-pkgver=0.9.6
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,12 +16,15 @@ depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
 options=('!libtool')
 backup=('etc/denemo/denemo.conf')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('48dd1b0801dba574517bcaf0b86d714a')
+md5sums=('92bfd2e661387f791e4aa6c23dc7d90b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
-#  sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ejabberd/2.1.12rc.diff.gz b/community/ejabberd/2.1.12rc.diff.gz
deleted file mode 100644
index 69769d8a4..000000000
--- a/community/ejabberd/2.1.12rc.diff.gz
+++ /dev/null
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index b7654e8f1..812a0255c 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86040 2013-03-11 15:56:20Z spupykin $
+# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
-pkgver=2.1.11
-pkgrel=9
+pkgver=2.1.12
+pkgrel=1
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.ejabberd.im/"
@@ -18,17 +18,14 @@ install=$pkgname.install
 source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
 	"$pkgname.logrotate"
 	"$pkgname"
-	"ejabberd.service"
-	"2.1.12rc.diff.gz")
-md5sums=('a70b040c4e7602f47718c8afe8780d50'
+	"ejabberd.service")
+md5sums=('7d49242cf04282f3c4cebfafa2cc2f46'
          'f97c8a96160f30e0aecc9526c12e6606'
          '2338a6230ce5f9f60be6dddcfa39bc7e'
-         'df32aa17e40a7bc5d9946d3ba6fe5e16'
-         '688e99cdc1fc3a12501caabaec2293a4')
+         'df32aa17e40a7bc5d9946d3ba6fe5e16')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/src"
-  patch -p2 <$srcdir/2.1.12rc.diff
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-pam --enable-odbc
   make
diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD
new file mode 100644
index 000000000..55bbd0ba4
--- /dev/null
+++ b/community/gnome-applets/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 87904 2013-04-08 14:47:20Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-applets
+pkgver=3.5.92
+pkgrel=1
+pkgdesc="GNOME Applets"
+arch=(i686 x86_64 'mips64el')
+license=('GPL')
+depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager')
+options=(!emptydirs)
+url="http://www.gnome.org"
+install=gnome-applets.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
+
+build() {
+  cd "$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
+      --localstatedir=/var --disable-static \
+      --disable-scrollkeeper --disable-schemas-install \
+      --without-hal
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
diff --git a/community/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install
new file mode 100644
index 000000000..e3441e722
--- /dev/null
+++ b/community/gnome-applets/gnome-applets.install
@@ -0,0 +1,24 @@
+pkgname=gnome-applets
+
+post_install() {
+  gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community/gnome-media/PKGBUILD b/community/gnome-media/PKGBUILD
new file mode 100644
index 000000000..2b60a714d
--- /dev/null
+++ b/community/gnome-media/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 87933 2013-04-08 20:25:18Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-media
+pkgver=3.4.0
+pkgrel=2
+pkgdesc="Sound recorder and GStreamer 0.10 configuration tool for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnome-media-profiles' 'gstreamer0.10-good-plugins' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('gstreamer0.10-ugly-plugins: Record sound into mp3 format')
+url="https://git.gnome.org/browse/gnome-media"
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+        grecord-add-PULSEPROPmediarole.patch
+        grecord-Should-call-gnome-control-center-sound-not.patch
+        grecord-send-eos-before-we-stop-record.patch)
+sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f'
+            '7abd86638ccde30232455ea66a7aff244f5c1cc5f3620b85f0215bf4bd07d546'
+            '6c8af4bf741d702ce3722cc2bfd1b7caa44f142776706157851184fb2bc55e04'
+            '5feb1e447f9ac575b282b05be9bfc946794635f98f63cf24603f931767ec8f9d')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # Upstream fixes
+  patch -Np1 -i "$srcdir/grecord-add-PULSEPROPmediarole.patch"
+  patch -Np1 -i "$srcdir/grecord-Should-call-gnome-control-center-sound-not.patch"
+  patch -Np1 -i "$srcdir/grecord-send-eos-before-we-stop-record.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Sound theme moved to gnome-control-center
+  rm -rf "$pkgdir"/usr/share/{gnome-media,sounds}
+}
diff --git a/community/gnome-media/gnome-media.install b/community/gnome-media/gnome-media.install
new file mode 100644
index 000000000..0574e8765
--- /dev/null
+++ b/community/gnome-media/gnome-media.install
@@ -0,0 +1,26 @@
+pkgname=gnome-sound-recorder
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  if [ "$(vercmp 3.4.0-2 "$2")" -eq 1 ]; then
+    usr/sbin/gconfpkg --uninstall gnome-media
+  else
+    usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch
new file mode 100644
index 000000000..e3908d3cc
--- /dev/null
+++ b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch
@@ -0,0 +1,35 @@
+From ea6fee0fbf8662a32a5cd2b5c96c1f75a9233813 Mon Sep 17 00:00:00 2001
+From: Sebastien Bacher <seb128@ubuntu.com>
+Date: Thu, 07 Jun 2012 16:26:26 +0000
+Subject: grecord: Should call "gnome-control-center sound" not the old g-v-c
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667402
+---
+diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
+index bebb991..bd802d6 100644
+--- a/grecord/src/gsr-window.c
++++ b/grecord/src/gsr-window.c
+@@ -805,16 +805,16 @@ run_mixer_cb (GtkAction *action,
+ 	       GSRWindow *window)
+ {
+ 	char *mixer_path;
+-	char *argv[4] = {NULL, "--page", "recording",  NULL};
++	char *argv[4] = {NULL, "sound", "input",  NULL};
+ 	GError *error = NULL;
+ 	gboolean ret;
+ 
+ 	/* Open the mixer */
+-	mixer_path = g_find_program_in_path ("gnome-volume-control");
++	mixer_path = g_find_program_in_path ("gnome-control-center");
+ 	if (mixer_path == NULL) {
+ 		show_error_dialog (GTK_WINDOW (window), NULL,
+ 		                   _("%s is not installed in the path."),
+-		                   "gnome-volume-control");
++		                   "gnome-control-center");
+ 		return;
+ 	}
+ 
+--
+cgit v0.9.1
diff --git a/community/gnome-media/grecord-add-PULSEPROPmediarole.patch b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch
new file mode 100644
index 000000000..b75dd3c5c
--- /dev/null
+++ b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch
@@ -0,0 +1,26 @@
+From 5453719b61ada75f635f0c3ad3c78651102d7615 Mon Sep 17 00:00:00 2001
+From: Oleksij Rempel <bug-track@fisher-privat.net>
+Date: Wed, 06 Jun 2012 11:50:04 +0000
+Subject: grecord: add "PULSE_PROP_media.role"
+
+For more details see:
+http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/ApplicationProperties
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=644908
+---
+diff --git a/grecord/src/gnome-recorder.c b/grecord/src/gnome-recorder.c
+index c6c7b7e..c7ec5cc 100644
+--- a/grecord/src/gnome-recorder.c
++++ b/grecord/src/gnome-recorder.c
+@@ -190,6 +190,7 @@ main (int argc,
+ 
+ 	g_option_context_free (ctx);
+ 	gtk_window_set_default_icon_name ("gnome-sound-recorder");
++	g_setenv ("PULSE_PROP_media.role", "production", TRUE);
+ 
+ 	/* use it like a singleton */
+ 	gconf_client = gconf_client_get_default ();
+--
+cgit v0.9.1
diff --git a/community/gnome-media/grecord-send-eos-before-we-stop-record.patch b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch
new file mode 100644
index 000000000..e760b7e3b
--- /dev/null
+++ b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch
@@ -0,0 +1,41 @@
+From 99e7a41b2e4c217aca7faffb7668b1ac84ae1ed2 Mon Sep 17 00:00:00 2001
+From: Oleksij Rempel <bug-track@fisher-privat.net>
+Date: Thu, 07 Jun 2012 17:11:02 +0000
+Subject: grecord: send eos before we stop record.
+
+Current grecord produces files without EOS. This can be tested
+with tool "ogginfo".
+
+accodrding to this documentation:
+http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html
+"Controlled shutdown of live sources in applications"
+"Since GStreamer 0.10.16 an application may send an EOS event to a source element to make it perform the EOS logic".
+
+So this patch make sure we send EOS before we stop recording.
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=677644
+---
+diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
+index bd802d6..850ebf0 100644
+--- a/grecord/src/gsr-window.c
++++ b/grecord/src/gsr-window.c
+@@ -1279,8 +1279,14 @@ stop_cb (GtkAction *action,
+ 		GST_DEBUG ("Stopping play pipeline");
+ 		set_pipeline_state_to_null (priv->play->pipeline);
+ 	} else if (priv->record && priv->record->state == GST_STATE_PLAYING) {
++		GstMessage *msg;
++
+ 		GST_DEBUG ("Stopping recording source");
+-		/* GstBaseSrc will automatically send an EOS when stopping */
++		gst_element_send_event (priv->record->src, gst_event_new_eos ());
++		/* wait one second for EOS message on the pipeline bus */
++		msg = gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (priv->record->pipeline), GST_SECOND, GST_MESSAGE_EOS | GST_MESSAGE_ERROR);
++		gst_message_unref (msg);
++
+ 		gst_element_set_state (priv->record->src, GST_STATE_NULL);
+ 		gst_element_get_state (priv->record->src, NULL, NULL, -1);
+ 		gst_element_set_locked_state (priv->record->src, TRUE);
+--
+cgit v0.9.1
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
new file mode 100644
index 000000000..5e251b8d5
--- /dev/null
+++ b/community/gnome-panel/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 87902 2013-04-08 14:46:15Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-panel
+pkgver=3.6.2
+pkgrel=1.1
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+pkgdesc="The GNOME Panel"
+url="http://www.gnome.org"
+depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
+         'gconf' 'telepathy-glib')
+makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
+install=gnome-panel.install
+groups=('gnome')
+provides=("gnome-panel-bonobo=${pkgver}")
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079')
+
+build() {
+  cd "$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gnome-panel \
+      --disable-scrollkeeper \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
diff --git a/community/gnome-panel/gnome-panel.install b/community/gnome-panel/gnome-panel.install
new file mode 100644
index 000000000..0f9324937
--- /dev/null
+++ b/community/gnome-panel/gnome-panel.install
@@ -0,0 +1,24 @@
+pkgname=gnome-panel
+
+post_install() {
+  gconfpkg --install $pkgname
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
new file mode 100644
index 000000000..f2caf3889
--- /dev/null
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 87900 2013-04-08 14:45:13Z heftig $
+# Maintainer: Roman Kyrylych <roman@archlinux.org>
+
+pkgname=gnome-phone-manager
+pkgver=0.68
+pkgrel=3
+pkgdesc="Control your mobile phone from your GNOME desktop."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://live.gnome.org/PhoneManager"
+license=('GPL')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf')
+makedepends=('intltool')
+options=('!emptydirs' '!libtool')
+install=gnome-phone-manager.install
+source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
+        gnome-phone-manager-0.68-eds.patch)
+sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
+            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
new file mode 100644
index 000000000..2a36de13a
--- /dev/null
+++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
@@ -0,0 +1,386 @@
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
+index dc8e2e3..d95e5b9 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.c
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
+@@ -38,11 +38,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libedataserver/e-source.h>
+-#include <libebook/e-book.h>
+-#include <libebook/e-book-view.h>
+-#include <libebook/e-contact.h>
+-
+ #include "e-contact-entry.h"
+ #include "econtactentry-marshal.h"
+ 
+@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
+ /* Properties */
+ enum {
+   PROP_0, /* TODO: why? */
+-  PROP_SOURCE_LIST,
++  PROP_REGISTRY,
+   PROP_COMPLETE_LENGTH,
+ };
+ 
+@@ -70,7 +65,7 @@ enum {
+ struct EContactEntryPriv {
+   GtkEntryCompletion *completion;
+   GtkListStore *store;
+-  ESourceList *source_list;
++  ESourceRegistry *registry;
+   /* A list of EntryLookup structs we are searching */
+   GList *lookup_entries;
+   /* Number of characters to start searching at */
+@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
+   emails = e_contact_get (contact, E_CONTACT_EMAIL);
+   for (l = emails; l != NULL; l = l->next) {
+     item = g_new0 (EContactEntyItem, 1);
+-    item->identifier = item->identifier = g_strdup (l->data);
++    item->identifier = g_strdup (l->data);
+     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
+ 
+     items = g_list_prepend (items, item);
+@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+       return;
+ 
+     photo = e_contact_get (contact, E_CONTACT_PHOTO);
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-    if (photo) {
+-#else
+     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+-#endif
+       GdkPixbufLoader *loader;
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
+-#else
+       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+ 			      photo->data.inlined.length, NULL))
+-#endif
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
+@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+  * The query on the EBookView has completed.
+  */
+ static void
+-view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
++view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
+ {
+   EntryLookup *lookup;
+   g_return_if_fail (user_data != NULL);
+-  /* TODO: handle status != OK */
+-  g_return_if_fail (status == E_BOOK_ERROR_OK);
+   g_return_if_fail (book_view != NULL);
+ 
+   lookup = (EntryLookup*)user_data;
+   g_object_unref (lookup->bookview);
++  lookup->bookview = NULL;
+ }
+ 
+ /**
+@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
+   lookup->bookview = book_view;
+   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
+   
+-  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
+-  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
++  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
++  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
+   
+   e_book_view_start (book_view);
+ }
+@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       if (lookup->bookview) {
+         e_book_view_stop (lookup->bookview);
+         g_object_unref (lookup->bookview);
++        lookup->bookview = NULL;
+       }
+     }
+     
+@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       if (!lookup->open)
+         continue;
+       
+-      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
++      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
+         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
+       }
+     }
+@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
+  */
+ 
+ void
+-e_contact_entry_set_source_list (EContactEntry *entry,
+-    				  ESourceList *source_list)
++e_contact_entry_set_registry (EContactEntry *entry,
++    			      ESourceRegistry *registry)
+ {
++  GList *list, *link;
++  const gchar *extension_name;
+   GError *error = NULL;
+-  GSList *list, *l;
+ 
+   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
+ 
+@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
+     g_list_free (entry->priv->lookup_entries);
+   }
+-  if (entry->priv->source_list) {
+-    g_object_unref (entry->priv->source_list);
++  if (entry->priv->registry) {
++    g_object_unref (entry->priv->registry);
+   }
+ 
+   /* If we have no new sources, disable and return here */
+-  if (source_list == NULL) {
++  if (registry == NULL) {
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+-    entry->priv->source_list = NULL;
++    entry->priv->registry = NULL;
+     entry->priv->lookup_entries = NULL;
+     return;
+   }
+ 
+-  entry->priv->source_list = source_list;
+-  /* So that the list isn't going away underneath us */
+-  g_object_ref (entry->priv->source_list);
++  entry->priv->registry = registry;
++  /* So that the registry isn't going away underneath us */
++  g_object_ref (entry->priv->registry);
+ 
+-  /* That gets us a list of ESourceGroup */
+-  list = e_source_list_peek_groups (source_list);
+   entry->priv->lookup_entries = NULL;
+ 
+-  for (l = list; l != NULL; l = l->next) {
+-    ESourceGroup *group = l->data;
+-    GSList *sources = NULL, *m;
+-    /* That should give us a list of ESource */
+-    sources = e_source_group_peek_sources (group);
+-    for (m = sources; m != NULL; m = m->next) {
+-      ESource *source = m->data;
+-      ESource *s = e_source_copy (source);
+-      EntryLookup *lookup;
+-      char *uri;
++  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
++  list = e_source_registry_list_sources (registry, extension_name);
+ 
+-      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
+-      e_source_set_absolute_uri (s, uri);
+-      g_free (uri);
++  for (link = list; link != NULL; link = g_list_next (link)) {
++    ESource *source = E_SOURCE (link->data);
++    EntryLookup *lookup;
+ 
+-      /* Now add those to the lookup entries list */
+-      lookup = g_new0 (EntryLookup, 1);
+-      lookup->entry = entry;
+-      lookup->status = E_BOOK_ERROR_OK;
+-      lookup->open = FALSE;
++    /* Now add those to the lookup entries list */
++    lookup = g_new0 (EntryLookup, 1);
++    lookup->entry = entry;
++    lookup->status = E_BOOK_ERROR_OK;
++    lookup->open = FALSE;
+ 
+-      if ((lookup->book = e_book_new (s, &error)) == NULL) {
+-        /* TODO handle this better, fire the error signal I guess */
++    if ((lookup->book = e_book_new (source, &error)) == NULL) {
++      /* TODO handle this better, fire the error signal I guess */
++      if (error) {
+         g_warning ("%s", error->message);
+-	g_error_free (error);
+-	g_free (lookup);
+-      } else {
+-        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
+-	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
++        g_error_free (error);
++        error = NULL;
+       }
+-
+-      g_object_unref (s);
++      g_free (lookup);
++    } else {
++      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
++      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
+     }
+   }
+ 
+@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+ }
+ 
+-ESourceList *
+-e_contact_entry_get_source_list (EContactEntry *entry)
++ESourceRegistry *
++e_contact_entry_get_registry (EContactEntry *entry)
+ {
+   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
+ 
+-  return entry->priv->source_list;
++  return entry->priv->registry;
+ }
+ 
+ void
+@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    e_contact_entry_set_source_list (entry, g_value_get_object (value));
++  case PROP_REGISTRY:
++    e_contact_entry_set_registry (entry, g_value_get_object (value));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
+@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    g_value_set_object (value, e_contact_entry_get_source_list (entry));
++  case PROP_REGISTRY:
++    g_value_set_object (value, e_contact_entry_get_registry (entry));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
+@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
+     g_list_free (entry->priv->lookup_entries);
+     g_object_unref (entry->priv->completion);
+     g_object_unref (entry->priv->store);
+-    g_object_unref (entry->priv->source_list);
++    g_object_unref (entry->priv->registry);
+ 
+     if (entry->priv->display_destroy) {
+       entry->priv->display_destroy (entry->priv->display_func);
+@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
+ static void
+ reset_search_fields (EContactEntry *entry)
+ {
+-  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
++  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
+ 
+   g_free (entry->priv->search_fields);
+   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
+@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
+   object_class->finalize = e_contact_entry_finalize;
+ 
+   /* Properties */
+-  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
+-                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
+-                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
++  g_object_class_install_property (object_class, PROP_REGISTRY,
++                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
++                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
+   
+   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
+                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
+@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
+   if (lookup->bookview) {
+     g_warning("EBookView still around");
+     g_object_unref (lookup->bookview);
++    lookup->bookview = NULL;
+   }
+   if (lookup->book) {
+     g_object_unref (lookup->book);
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
+index bf6b39b..6fedef7 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.h
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
+@@ -23,10 +23,8 @@
+ #ifndef CONTACT_ENTRY_H
+ #define CONTACT_ENTRY_H
+ 
+-#include <libedataserver/e-source-group.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libebook/e-contact.h>
+ #include <gtk/gtk.h>
++#include <libebook/libebook.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
+ 
+ GtkWidget *e_contact_entry_new (void);
+ 
+-void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
+-ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
++void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
++ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
+ 
+ void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
+ int e_contact_entry_get_complete_length(EContactEntry *entry);
+diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
+index 4e62e10..baef34f 100644
+--- a/libgsm/phonemgr-utils.c
++++ b/libgsm/phonemgr-utils.c
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <glib-object.h>
+-#include <libebook/e-contact.h>
++#include <libebook/libebook.h>
+ #include <gnokii.h>
+ 
+ #include <bluetooth/bluetooth.h>
+diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
+index 5d25622..38f4c2f 100644
+--- a/src/e-phone-entry.c
++++ b/src/e-phone-entry.c
+@@ -31,8 +31,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libedataserverui/e-client-utils.h>
++#include <libedataserverui/libedataserverui.h>
+ #include "e-phone-entry.h"
+ 
+ #define CONTACT_FORMAT "%s (%s)"
+@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
+ }
+ 
+ static void
+-add_sources (EContactEntry *entry)
+-{
+-	ESourceList *source_list;
+-
+-	if (e_client_utils_get_sources (&source_list,
+-					E_CLIENT_SOURCE_TYPE_CONTACTS,
+-					NULL)) {
+-		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
+-						 source_list);
+-		g_object_unref (source_list);
+-	}
+-}
+-
+-static void
+ e_phone_entry_init (EPhoneEntry *entry)
+ {
+ 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
++	ESourceRegistry *registry;
++	GError *error = NULL;
++
++	/* XXX This call blocks while a D-Bus connection is made, possibly
++	 *     requiring activation.  Might be better to create the registry
++	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
++	 *     take it as an argument.  Calling this from main() means if it
++	 *     fails you can abort cleanly with a console error message. */
++	registry = e_source_registry_new_sync (NULL, &error);
++	if (registry == NULL) {
++		g_error ("%s: %s", G_STRFUNC, error->message);
++		g_assert_not_reached ();
++	}
++	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
++	g_object_unref (registry);
+ 
+-	add_sources (E_CONTACT_ENTRY (entry));
+ 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
+ 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
+ 	g_signal_connect (G_OBJECT (entry), "contact_selected",
diff --git a/community/gnome-phone-manager/gnome-phone-manager.install b/community/gnome-phone-manager/gnome-phone-manager.install
new file mode 100644
index 000000000..91212fa2e
--- /dev/null
+++ b/community/gnome-phone-manager/gnome-phone-manager.install
@@ -0,0 +1,17 @@
+pkgname=gnome-phone-manager
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
new file mode 100644
index 000000000..bcd23e3a1
--- /dev/null
+++ b/community/gnome-screensaver/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 87889 2013-04-08 14:39:56Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-screensaver
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
+makedepends=('pkgconfig' 'intltool' 'libxss')
+groups=('gnome')
+options=(!emptydirs)
+install=gnome-screensaver.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+       gnome-screensaver.pam)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-screensaver \
+      --localstatedir=/var \
+      --with-mit-ext --with-systemd
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}
diff --git a/community/gnome-screensaver/gnome-screensaver.install b/community/gnome-screensaver/gnome-screensaver.install
new file mode 100644
index 000000000..d1a42c6ce
--- /dev/null
+++ b/community/gnome-screensaver/gnome-screensaver.install
@@ -0,0 +1,7 @@
+pkgname=gnome-screensaver
+
+pre_upgrade() {
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        gconfpkg --uninstall ${pkgname}
+    fi
+}
diff --git a/community/gnome-screensaver/gnome-screensaver.pam b/community/gnome-screensaver/gnome-screensaver.pam
new file mode 100644
index 000000000..453dae646
--- /dev/null
+++ b/community/gnome-screensaver/gnome-screensaver.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        required     pam_unix_auth.so nullok
+auth        optional     pam_gnome_keyring.so
diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD
index 360a1f82f..cb8825e45 100644
--- a/community/icewm-utils/PKGBUILD
+++ b/community/icewm-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $
+# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Dominika Solarz <dominikasolarz@gmail.com>
 
@@ -50,11 +50,6 @@ md5sums=('cb2afc6efaa0f9d77b0119b29d528667'
          '5116da930c0063dd8c478dd8e473b08f')
 
 build() {
-  mkdir -p $pkgdir/usr/bin
-
-  . /etc/profile.d/qt3.sh
-  export PATH=/opt/qt/bin:$PATH
-
   cd $srcdir
   # fix default global path to IceWM
   for file in icewoed-$_woedver/qcentralwidget.cpp \
@@ -73,40 +68,43 @@ build() {
   (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff)
 
   cd $srcdir/icemc-$_mcver
-  qmake
-  make
-  cp icemc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icets-$_tsver
-  qmake
-  make
-  cp icets $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icebgset-$_bgsetver
-  qmake
-  make
-  cp icebgset $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/iceked-$_kedver
-  qmake 
-  make
-  cp iceked $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icecc-$_ccver
-  qmake 
-  make
-  cp icecc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icesndcfg-$_sndcfgver
-  qmake 
-  make
-  cp icesndcfg $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icewoed-$_woedver
-  qmake 
-  make
-  cp icewoed $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
+}
 
+package() {
+  mkdir -p $pkgdir/usr/bin
+  cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/
+  cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/
+  cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/
+  cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/
+  cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/
+  cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/
+  cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/
   cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg
   cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt
   cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 5a3305dc1..002cba8ab 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83307 2013-01-29 09:59:04Z spupykin $
+# $Id: PKGBUILD 87846 2013-04-08 09:22:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ optdepends=('recordmydesktop: screen capture'
 install=kdenlive.install
 options=('docs')
 source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2)
-md5sums=('fed17b584aca6a9811a49f2348b4f6db')
+md5sums=('3bd3a511b860490acc367e7c9d7ffa43')
 
 build() {
   export LDFLAGS="$LDFLAGS -lX11"
diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD
new file mode 100644
index 000000000..6fc7c2a8f
--- /dev/null
+++ b/community/libgnome-media-profiles/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 87928 2013-04-08 18:08:07Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libgnome-media-profiles
+pkgver=3.0.0
+pkgrel=4
+pkgdesc="Library for management of audio recording profiles"
+arch=('i686' 'x86_64')
+url="https://git.gnome.org/browse/libgnome-media-profiles"
+license=('GPL2')
+depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
+makedepends=('intltool' 'gnome-doc-utils')
+options=('!libtool')
+install=$pkgname.install
+source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-static --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libgnome-media-profiles/libgnome-media-profiles.install b/community/libgnome-media-profiles/libgnome-media-profiles.install
new file mode 100644
index 000000000..1c2bfeac0
--- /dev/null
+++ b/community/libgnome-media-profiles/libgnome-media-profiles.install
@@ -0,0 +1,21 @@
+pkgname=gnome-media-profiles
+
+post_install(){
+    usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+    pre_remove $1
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+    if [ "$(vercmp 3.0.0-4 "$2")" -eq 1 ]; then
+      usr/sbin/gconfpkg --uninstall libgnome-media-profiles
+    else
+      usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
+}
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 6de777534..b8b421b6c 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83879 2013-02-06 10:39:46Z spupykin $
+# $Id: PKGBUILD 88045 2013-04-10 16:08:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=libmicrohttpd
 pkgver=0.9.25
-pkgrel=1
+pkgrel=2
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libmicrohttpd/"
@@ -32,6 +32,6 @@ package() {
 	${pkgdir}/usr/include/$pkgname/platform.h
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
 	${pkgdir}/usr/include/$pkgname/plibc.h
-  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
+  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \
 	$pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
 }
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index cb6a00ee9..1d511ce1b 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87709 2013-04-05 10:27:37Z spupykin $
+# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 # Contributor: Chuck Yang <Chuck.Yang@gmail.com>
 
 pkgname=lshw
 pkgver=B.02.16
-pkgrel=3
+pkgrel=4
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
 license=('GPL')
@@ -18,6 +18,7 @@ md5sums=('67479167add605e8f001097c30e96d0d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop
   make
   make gui
 }
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index 618c70728..e5944628f 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 80003 2012-11-15 11:55:57Z spupykin $
+# $Id: PKGBUILD 87850 2013-04-08 09:23:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
 # Maintainer: Jon Nordby <jononor@gmail.com>
 
 pkgname=lxc
-pkgver=0.8.0
+pkgver=0.9.0
 epoch=1
-pkgrel=2
+pkgrel=1
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('7304fa57146ce687f749b5df876bb20d')
+md5sums=('8552a4479090616f4bc04d8473765fc9')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 2a6cc72c7..c5b08cbfc 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $
+# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -29,7 +29,6 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-$pkgver.orig
 
   patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff
@@ -42,11 +41,17 @@ build() {
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
   sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
-  cp $srcdir/fake-g++.sh ./g++
+  install -m755 $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons
-  scons install_to=$pkgdir/usr prefix=/usr install
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver.orig
+
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \
+    install_to=$pkgdir/usr prefix=/usr install
 
   install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
   install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD
index 4c5abc0cc..3519ac8dd 100644
--- a/community/mandvd/PKGBUILD
+++ b/community/mandvd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65689 2012-02-21 21:57:30Z jlichtblau $
+# $Id: PKGBUILD 87997 2013-04-09 21:40:35Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com>
@@ -12,16 +12,18 @@ url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906"
 license=('GPL')
 depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4')
 changelog=$pkgname.changelog
-source=(http://ftp.sh.cvut.cz/MIRRORS/vector/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
+source=(http://vectorlinux.osuosl.org/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
 sha256sums=('967fd66da31f0619001b3aaea494ab41579ab7ffdc6a1b0a51a4a4add012eb9c')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  source /etc/profile.d/qt3.sh
-  ${QTDIR}/bin/qmake
+  qmake-qt3
   sed -i "s|O2|O1|" ./Makefile
-  make
+  sed -i 's|-I$(QTDIR)/include|-I/usr/include/qt3|' Makefile
+  sed -i '55 i\#include <unistd.h>' main.cpp
+  sed -i '28 i\#include <unistd.h>' mandvd.cpp
+  make QTDIR=/usr MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3
 }
 
 package() {
diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
new file mode 100644
index 000000000..0131d328f
--- /dev/null
+++ b/community/metacity/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 87887 2013-04-08 14:38:04Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=metacity
+pkgver=2.34.13
+pkgrel=1.1
+pkgdesc="A window manager for GNOME"
+arch=(i686 x86_64 'mips64el')
+license=('GPL')
+depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 'libsm' 'startup-notification' 'zenity')
+makedepends=('intltool' 'yelp-tools')
+url="http://www.gnome.org"
+groups=('gnome')
+options=('!libtool' '!emptydirs')
+install=metacity.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fix_compositing_startup.patch)
+sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
+            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2')
+
+build() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i "${srcdir}/fix_compositing_startup.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/metacity \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/metacity/fix_compositing_startup.patch b/community/metacity/fix_compositing_startup.patch
new file mode 100644
index 000000000..56b218ae7
--- /dev/null
+++ b/community/metacity/fix_compositing_startup.patch
@@ -0,0 +1,12 @@
+diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c
+--- metacity-2.34.5.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.5/src/compositor/compositor-xrender.c	2012-08-28 14:23:04.093750568 +0200
+@@ -3066,6 +3057,8 @@
+ #endif
+ 
+   xrc->enabled = TRUE;
++  xrc->show_redraw = FALSE;
++  xrc->debug = FALSE;
+   g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc);
+ 
+   return compositor;
diff --git a/community/metacity/metacity.install b/community/metacity/metacity.install
new file mode 100644
index 000000000..ba0feffc1
--- /dev/null
+++ b/community/metacity/metacity.install
@@ -0,0 +1,19 @@
+pkgname=metacity
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        /usr/sbin/gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD
index 3804e7621..a11e7afc8 100644
--- a/community/opencollada/PKGBUILD
+++ b/community/opencollada/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 84701 2013-02-22 15:29:30Z svenstaro $
+# $Id: PKGBUILD 87935 2013-04-08 20:59:14Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=opencollada
-pkgver=20130222
+pkgver=20130408
 pkgrel=1
 pkgdesc="Stream based reader and writer library for COLLADA files"
 arch=(i686 x86_64)
@@ -9,40 +9,27 @@ url="https://github.com/KhronosGroup/OpenCOLLADA"
 license=('GPL')
 depends=('libxml2' 'pcre')
 makedepends=('git' 'cmake')
-source=('opencollada.conf')
-md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d')
-
-_gitroot=git://github.com/KhronosGroup/OpenCOLLADA.git
-_gitname=opencollada
+source=('opencollada.conf'
+        'git://github.com/KhronosGroup/OpenCOLLADA.git')
+md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d'
+         'SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir"/OpenCOLLADA
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
+# Activate these once pr#124 is merged
+#    -DUSE_SHARED=ON \
+#    -DUSE_STATIC=OFF \
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$_gitname-build/build"
+  cd "$srcdir"/OpenCOLLADA/build
 
   make DESTDIR=$pkgdir install
 
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 16d8f8e99..39bafce1c 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87649 2013-04-05 01:44:23Z allan $
+# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
 pkgver=0.7.6
-pkgrel=6
+pkgrel=9
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
@@ -18,7 +18,7 @@ source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
 	'libarchive.patch')
 sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
             'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
-	    '067f39917f5442b8146c793b62f86f66fc8a4c7e391c0f3219d13f98d45ba630'
+	    'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415'
 	    '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
 
 build() {
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
index aeba9c347..8b972b291 100644
--- a/community/packagekit/alpm.patch
+++ b/community/packagekit/alpm.patch
@@ -40,7 +40,7 @@ index 5c6b629..a4cd197 100644
  			     alpm_strerror (errno));
  	}
 diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
-index c8fd13b..1a82637 100644
+index c8fd13b..03adb47 100644
 --- a/backends/alpm/pk-backend-config.c
 +++ b/backends/alpm/pk-backend-config.c
 @@ -33,35 +33,32 @@
@@ -357,14 +357,14 @@ index c8fd13b..1a82637 100644
 +
 +	return g_strcmp0 (section->name, name);
 +}
-+
+ 
+-	if (alpm_list_find_str (config->repos, repo) == NULL) {
+-		config->repos = alpm_list_add (config->repos, g_strdup (repo));
 +static PkBackendConfigSection *
 +pk_backend_config_enter_section (PkBackendConfig *config, const gchar *name)
 +{
 +	PkBackendConfigSection *section;
- 
--	if (alpm_list_find_str (config->repos, repo) == NULL) {
--		config->repos = alpm_list_add (config->repos, g_strdup (repo));
++
 +	g_return_val_if_fail (config != NULL, NULL);
 +	g_return_val_if_fail (name != NULL, NULL);
 +
@@ -426,8 +426,8 @@ index c8fd13b..1a82637 100644
  {
 -	alpm_siglevel_t *level;
 -
- 	g_return_val_if_fail (config != NULL, FALSE);
- 	g_return_val_if_fail (section != NULL, FALSE);
+-	g_return_val_if_fail (config != NULL, FALSE);
+-	g_return_val_if_fail (section != NULL, FALSE);
 -	g_return_val_if_fail (list != NULL, FALSE);
 -
 -	level = g_hash_table_lookup (config->levels, section);
@@ -439,8 +439,7 @@ index c8fd13b..1a82637 100644
 -
 -	while (TRUE) {
 -		gboolean package = TRUE, database = TRUE;
-+	g_return_val_if_fail (words != NULL, FALSE);
- 
+-
 -		if (g_str_has_prefix (list, "Package")) {
 -			database = FALSE;
 -			list += 7;
@@ -506,7 +505,10 @@ index c8fd13b..1a82637 100644
 -			++list;
 -		}
 -	}
--
++	g_return_if_fail (config != NULL);
++	g_return_if_fail (section != NULL);
++	g_return_if_fail (words != NULL);
+ 
 -	return TRUE;
 +	section->siglevels = alpm_list_add_words (section->siglevels, words);
  }
diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD
index 4da652f91..b46eff23f 100644
--- a/community/pdfedit/PKGBUILD
+++ b/community/pdfedit/PKGBUILD
@@ -19,15 +19,11 @@ md5sums=('80502ee7f08cdfb867ffdaa92d160a23'
          'c0572c2dd54065322321718aa49ed6b8')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  export PATH="$QTDIR/bin:$PATH"
-  export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc
-  ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake
-  make
+  QTDIR=/usr ./configure --prefix=/usr
+  make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr
 }
 
 package() {
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index 5e91965e1..5e5d3dd39 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86563 2013-03-19 15:14:56Z foutrelis $
+# $Id: PKGBUILD 87836 2013-04-08 08:42:56Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcache
-pkgver=3.0.7
-pkgrel=2
+pkgver=3.0.8
+pkgrel=1
 pkgdesc="Memcache module for PHP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcache"
@@ -11,17 +11,12 @@ license=('PHP')
 depends=('php')
 backup=('etc/php/conf.d/memcache.ini')
 install=php-memcache.install
-source=(http://pecl.php.net/get/memcache-$pkgver.tgz
-        php-memcache-3.0.7-fix-segfault-with-object-serialization.patch)
-sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f'
-            '100bffed22ad537de1cb03653e2dbb6768617ba3b8b49b1cf05c59554270c25b')
+source=(http://pecl.php.net/get/memcache-$pkgver.tgz)
+sha256sums=('2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311')
 
 build() {
   cd "$srcdir/memcache-$pkgver"
 
-  # https://bugs.php.net/bug.php?id=63142
-  patch -Np0 -i "$srcdir/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch"
-
   phpize
   ./configure --prefix=/usr
   make
diff --git a/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch b/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
deleted file mode 100644
index f3909746b..000000000
--- a/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: memcache.c
-===================================================================
---- memcache.c	(revision 329831)
-+++ memcache.c	(working copy)
-@@ -1529,15 +1529,13 @@
- 	unsigned int flags, unsigned long cas, void *param TSRMLS_DC) /*
- 	receives a multiple values, param is a zval** array to store value and flags in {{{ */
- {
--	zval *arrval, **result = (zval **)param;
--	ALLOC_ZVAL(arrval);
--	*((zval *)arrval) = *value;
-+	zval **result = (zval **)param;
- 
- 	/* add value to result */
- 	if (Z_TYPE_P(result[0]) != IS_ARRAY) {
- 		array_init(result[0]);
- 	}
--	add_assoc_zval_ex(result[0], (char *)key, key_len + 1, arrval);
-+	add_assoc_zval_ex(result[0], (char *)key, key_len + 1, value);
- 
- 	/* add flags to result */
- 	if (result[1] != NULL) {
-@@ -1565,7 +1563,7 @@
- 	receives a single value, param is a zval pointer to store value to {{{ */
- {
- 	zval **result = (zval **)param;
--	*(result[0]) = *value;
-+	ZVAL_ZVAL(result[0], value, 1, 1);
- 
- 	if (result[1] != NULL) {
- 		ZVAL_LONG(result[1], flags);
-Index: memcache_ascii_protocol.c
-===================================================================
---- memcache_ascii_protocol.c	(revision 329831)
-+++ memcache_ascii_protocol.c	(working copy)
-@@ -122,7 +122,7 @@
- 	line_len = mmc_stream_get_line(request->io, &line TSRMLS_CC);
- 	if (line_len > 0) {
- 		long lval;
--		zval value;
-+		zval *value;
- 
- 		int response = mmc_request_check_response(line, line_len);
- 		if (response != MMC_RESPONSE_UNKNOWN) {
-@@ -132,10 +132,10 @@
- 		if (sscanf(line, "%lu", &lval) < 1) {
- 			return mmc_server_failure(mmc, request->io, "Malformed VALUE header", 0 TSRMLS_CC);
- 		}
--		
--		INIT_PZVAL(&value);
--		ZVAL_LONG(&value, lval);
--		return request->value_handler(request->key, request->key_len, &value, 0, 0, request->value_handler_param TSRMLS_CC);
-+	
-+		MAKE_STD_ZVAL(value);
-+		ZVAL_LONG(value, lval);
-+		return request->value_handler(request->key, request->key_len, value, 0, 0, request->value_handler_param TSRMLS_CC);
- 	}
- 	
- 	return MMC_REQUEST_MORE;
-Index: memcache_binary_protocol.c
-===================================================================
---- memcache_binary_protocol.c	(revision 329831)
-+++ memcache_binary_protocol.c	(working copy)
-@@ -225,14 +225,14 @@
- 	header = (mmc_mutate_response_header_t *)mmc_stream_get(request->io, sizeof(*header) TSRMLS_CC);
- 	if (header != NULL) {
- 		int result;
--		zval *key, value;
-+		zval *key, *value;
- 
- 		/* convert remembered key to string and unpack value */
- 		key = (zval *)mmc_queue_item(&(req->keys), req->command.reqid);
-+	
-+		MAKE_STD_ZVAL(value);
-+		ZVAL_LONG(value, ntohll(header->value));
- 		
--		INIT_PZVAL(&value);
--		ZVAL_LONG(&value, ntohll(header->value));
--		
- 		if (Z_TYPE_P(key) != IS_STRING) {
- 			zval keytmp = *key;
- 			
-@@ -241,14 +241,14 @@
- 			convert_to_string(&keytmp);
- 
- 			result = request->value_handler(
--				Z_STRVAL(keytmp), Z_STRLEN(keytmp), &value, 
-+				Z_STRVAL(keytmp), Z_STRLEN(keytmp), value, 
- 				req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC);
- 			
- 			zval_dtor(&keytmp);
- 		}
- 		else {
- 			result = request->value_handler(
--				Z_STRVAL_P(key), Z_STRLEN_P(key), &value,
-+				Z_STRVAL_P(key), Z_STRLEN_P(key), value,
- 				req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC);
- 		}
- 		
-Index: memcache_pool.c
-===================================================================
---- memcache_pool.c	(revision 329831)
-+++ memcache_pool.c	(working copy)
-@@ -428,8 +428,8 @@
- 	unsigned long data_len;
- 	int rv;
- 
--	zval value;
--	INIT_ZVAL(value);
-+	zval *object;
-+	MAKE_STD_ZVAL(object);
- 
- 	if (flags & MMC_COMPRESSED) {
- 		if (mmc_uncompress(buffer->value.c, bytes, &data, &data_len) != MMC_OK) {
-@@ -445,8 +445,6 @@
- 	if (flags & MMC_SERIALIZED) {
- 		php_unserialize_data_t var_hash;
- 		const unsigned char *p = (unsigned char *)data;
--		zval *object = &value;
--
- 		char key_tmp[MMC_MAX_KEY_LEN + 1];
- 		mmc_request_value_handler value_handler;
- 		void *value_handler_param;
-@@ -501,7 +499,7 @@
- 				long val;
- 				data[data_len] = '\0';
- 				val = strtol(data, NULL, 10);
--				ZVAL_LONG(&value, val);
-+				ZVAL_LONG(object, val);
- 				break;
- 			}
- 
-@@ -509,17 +507,17 @@
- 				double val = 0;
- 				data[data_len] = '\0';
- 				sscanf(data, "%lg", &val);
--				ZVAL_DOUBLE(&value, val);
-+				ZVAL_DOUBLE(object, val);
- 				break;
- 			}
- 
- 			case MMC_TYPE_BOOL:
--				ZVAL_BOOL(&value, data_len == 1 && data[0] == '1');
-+				ZVAL_BOOL(object, data_len == 1 && data[0] == '1');
- 				break;
- 
- 			default:
- 				data[data_len] = '\0';
--				ZVAL_STRINGL(&value, data, data_len, 0);
-+				ZVAL_STRINGL(object, data, data_len, 0);
- 
- 				if (!(flags & MMC_COMPRESSED)) {
- 					/* release buffer because it's now owned by the zval */
-@@ -528,7 +526,7 @@
- 		}
- 
- 		/* delegate to value handler */
--		return request->value_handler(key, key_len, &value, flags, cas, request->value_handler_param TSRMLS_CC);
-+		return request->value_handler(key, key_len, object, flags, cas, request->value_handler_param TSRMLS_CC);
- 	}
- }
- /* }}}*/
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index 45d87f49e..f2a5b88f0 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 82158 2013-01-09 17:03:59Z spupykin $
+# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.4.6
+pkgver=2.5
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
-md5sums=('79d7f05e67bf70a0ecc6e9103ccece5f')
+source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz)
+md5sums=('facd82faa067e99b80146a0ee2f842f6')
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index a0426cee3..e850f3867 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,15 +6,16 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.11.0
-pkgrel=4
+pkgver=0.12.0
+pkgrel=1
 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" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz")
+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
@@ -29,7 +30,7 @@ build() {
 
   # build for python3
   cd scipy-${pkgver}
-  patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
+#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
@@ -80,5 +81,4 @@ package_python2-scipy() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('842c81d35fd63579c41a8ca21a2419b9'
-         '20d41a597ebfb260d777597e431a7a20')
+md5sums=('8fb4da324649f655e8557ea92b998786')
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 453b8ee2d..21712eeef 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $
+# $Id: PKGBUILD 88003 2013-04-09 21:45:04Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -19,17 +19,14 @@ source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community
         QCad.desktop
         qcad-intptr.patch
         qcad.patch)
-       # http://ghost1227.com/files/misc/qm.tar.gz)
 md5sums=('96b6a56027782aec953c9c4e64c5998c'
          'da32fec0d2fb85d96126bf28bb0ab9ff'
          'b4d1eb6724b4b41f191f1ab6fd859c39'
          '92f900fe1fd3a8f841232b587b49c7da'
          '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
 
 build() {
-  export PATH="/opt/qt/bin:$PATH"
-  export QTDIR=/opt/qt
-
   cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
 
   [ "$CARCH" = "x86_64" ] && {
@@ -40,7 +37,11 @@ build() {
   sed -i "s:"-pedantic"::g" mkspecs/defs.pro
 
   cd scripts
-  ./build_qcad.sh notrans
+  sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro
+  sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro
+  sed -i "s/qmake/qmake-qt3/" build_qcad.sh
+  sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|'  build_qcad.sh
+  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
 }
 
 package() {
diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD
index d015bc085..c66c167b3 100644
--- a/community/qgo/PKGBUILD
+++ b/community/qgo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64872 2012-02-18 19:23:28Z arodseth $
+# $Id: PKGBUILD 88006 2013-04-09 21:47:09Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -20,10 +20,9 @@ sha256sums=('ddfb66ada7027b844838895061f266bda03b327e8dfec2ee2782e14748bac104'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  . /etc/profile.d/qt3.sh
   patch -Np1 -i "$srcdir/gcc43.patch"
   patch -Np1 -i "$srcdir/gcc45.patch"
-  ./configure --prefix=/usr --build=$CHOST
+  ./configure --prefix=/usr --build=$CHOST --with-qt-includes=/usr/include/qt3
   make
 }
 
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
index 8de84ddb2..403a4d100 100644
--- a/community/qscintilla-qt3/PKGBUILD
+++ b/community/qscintilla-qt3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $
+# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net>
@@ -11,27 +11,22 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
 license=('GPL2')
 depends=('qt3')
-source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz")
 md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver
   cd qt
-  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro
-  /opt/qt/bin/qmake qscintilla.pro
-  make
+  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro
+  qmake-qt3 qscintilla.pro
+  sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile
+  make MOC=/usr/bin/moc-qt3
 }
 
 package() {
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt
   # installind includes
   for i in qextscintilla*.h; do
-    install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i
+    install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i
   done
-
-  #for i in qscintilla*.qm
-  #do
-  #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i
-  #done
 }
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index 9ab19a4c7..d6b4d0285 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65495 2012-02-21 06:38:19Z spupykin $
+# $Id: PKGBUILD 88012 2013-04-09 21:50:26Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com>
 
@@ -21,11 +21,14 @@ md5sums=('c916502171d422ab168fe5fc681b29d8'
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  . /etc/profile.d/qt3.sh
   export PATH=$QTDIR/bin:$PATH
 
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/qucs-gcc-4.5.1.patch
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD
index 5f3a72978..12bfb4ef3 100644
--- a/community/ragel/PKGBUILD
+++ b/community/ragel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60639 2011-12-16 00:03:11Z tredaelli $
+# $Id: PKGBUILD 87968 2013-04-09 16:09:00Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Michael P <ptchinster@archlinux.us>
 # Contributor: Roberto Alsina <ralsina@kde.org>
@@ -7,21 +7,18 @@
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=ragel
-pkgver=6.7
+pkgver=6.8
 pkgrel=1
 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.complang.org/ragel/"
 license=('GPL')
 depends=('gcc-libs')
-source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz"
-	"ragel-6.7-gcc-4.7.patch")
-md5sums=('f4423e0d8a6538dd4e61498fcfad3cec'
-	 'bcbc047873e09eef04900142fefa75f1')
+source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('1bb39745ac23da449019f9f2cb4b0d01')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/ragel-6.7-gcc-4.7.patch
   ./configure --prefix=/usr
   make
 }
@@ -31,4 +28,3 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 }
-
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index bcbe6580d..53e40af15 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86021 2013-03-11 10:38:45Z spupykin $
+# $Id: PKGBUILD 87868 2013-04-08 10:05:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -76,7 +76,8 @@ build() {
     --enable-arp-acl \
     --with-default-user=proxy \
     --enable-async-io \
-    --enable-truncate
+    --enable-truncate \
+    --enable-icap-client
   make
 }
 
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index c5252d4ea..c9e0357c4 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86306 2013-03-14 22:48:33Z bisson $
+# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z 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.19
-pkgrel=2
+pkgver=1.4.20
+pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
@@ -19,7 +19,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.service'
         'unbound.conf'
         'rc.d')
-sha1sums=('ccf0d465fc0045d59ceca11ecde688edebd28ec1'
+sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
           'a2493cb105ff6aa23d756514badb13b02d37f319'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 47ecda95a..2f9772d2d 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86635 2013-03-20 19:41:25Z bpiotrowski $
+# $Id: PKGBUILD 87866 2013-04-08 09:34:56Z tpowa $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
 pkgver=4.2.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 70e11b45c..e36fd36e4 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87621 2013-04-04 06:32:48Z foutrelis $
+# $Id: PKGBUILD 87865 2013-04-08 09:34:55Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
@@ -6,7 +6,7 @@ pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.10
 _extramodules=extramodules-3.8-ARCH
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 110042ad7..3e61f3447 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index b32e5c46e..378dab975 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index fc504490d..1f353b46c 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65377 2012-02-21 02:28:00Z spupykin $
+# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('qt3' 'libao' 'libxi')
 source=(http://www.uic.unn.ru/~soed/programs/chat/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('67974bc5df1ed0d63785d04325444d4f' 'de3af70da3743c27929f04f72c837412')
+md5sums=('67974bc5df1ed0d63785d04325444d4f'
+         'de3af70da3743c27929f04f72c837412')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-${pkgver}
   patch -Np1 <../build-fix.patch
   # Use _LDADD to properly compile with --as-needed
@@ -23,7 +23,11 @@ build() {
   # Correct acinclude.m4 to avoid empty else block
   sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4
   autoreconf -v
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 274db783a..67fe2ec4e 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD 87443 2013-03-31 19:19:06Z stephane $
+# $Id: PKGBUILD 88025 2013-04-10 08:22:45Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
+# TODO: Remove this note and change back to gcc once gcc 4.8.1 is out
+# It fixes a segfault while building the examples.
+
 pkgname=wt
-pkgver=3.2.3
-_pkgver=3.2.3
-pkgrel=6
+pkgver=3.3.0
+_pkgver=3.3.0
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt5-base')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4' 'clang')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
@@ -21,17 +24,17 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'graphicsmagick: for raster image support (WRasterImage)'
 	    'pango: for advanced font rendering (WRasterImage)'
 	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
+	    'qt4: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('58922ba5d68104880adbe2e022132fb5')
+md5sums=('b2331942ad01c4fda376abf30c6a503a')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
 
   [[ -d build ]] && rm -r build
   mkdir -p build && cd build
-  cmake \
+  CXX=clang++ cmake \
       -DCONNECTOR_HTTP=ON \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DWEBUSER=http \
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 7f4e3b8eb..19aeaca50 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86891 2013-03-23 23:10:55Z td123 $
+# $Id: PKGBUILD 87966 2013-04-09 15:45:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=10
+pkgrel=11
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
@@ -56,7 +56,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
          '31ab8c0980966dbe3e9f5e80b7b82612'
-         '19167aa54e4745853689abad72443b3e'
+         '47e68461589578e8a99857746c5b6f29'
          'e176971ef96807f72fa8fc17d260c20a')
 
 build() {
diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service
index a38584df1..6adcf207f 100644
--- a/community/xmms2/xmms2d.service
+++ b/community/xmms2/xmms2d.service
@@ -5,8 +5,8 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/xmms2d.conf
-ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
-ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
+ExecStart=/bin/su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
+ExecStop=/bin/su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index c16ef04d2..d11cfdb2b 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=zathura-pdf-mupdf
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
author	Michał Masłowski <mtjm@mtjm.eu>	2013-04-11 17:29:20 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-04-11 17:29:20 +0200
commit	7a42705e87e0da5d2417b4293729e3ee1ae3b33c (patch)
tree	04aa72c4fdff134e2c5ae9f539e092d5faafe808 /community
parent	e6ced89f44186539d8fedf73b62024aa2214230e (diff)
parent	337402b957bab442da9e0d46ee7a8d8f32ede3ce (diff)