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

Conflicts:
	community/portaudio_cpp/PKGBUILD
	extra/cmake/PKGBUILD
	extra/xfce4-clipman-plugin/PKGBUILD
	extra/xfce4-time-out-plugin/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	testing/telepathy-glib/PKGBUILD

40 files changed, 688 insertions, 89 deletions

diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD
index f49a4a6af..f31a9608a 100644
--- a/community/cdemu-client/PKGBUILD
+++ b/community/cdemu-client/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cdemu-client
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple command-line client for controlling cdemu-daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
@@ -20,7 +20,11 @@ build() {
   # python2 fix
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/cdemu
 
+  # bash completion dir change
+  sed -e 's,bashcompdir = $(sysconfdir)/bash_completion.d,bashcompdir = $(datadir)/bash-completion/completions,' -i data/Makefile.am data/Makefile.in
+
   ./configure --prefix=/usr
+
   make
 }
 
diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD
index df38eb4c2..ace0834a4 100644
--- a/community/dmenu/PKGBUILD
+++ b/community/dmenu/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 69466 2012-04-16 15:09:17Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+# $Id: PKGBUILD 69620 2012-04-20 14:11:11Z bpiotrowski $
+# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=dmenu
 pkgver=4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A generic menu for X"
 url="http://tools.suckless.org/dmenu/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
-depends=('sh' 'libxinerama' 'libxft' 'freetype2')
-source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz"
-	"http://tools.suckless.org/dmenu/patches/dmenu-$pkgver-xft.diff")
-md5sums=('9c46169ed703732ec52ed946c27d84b4'
-         'd448ec9120718b0aedbdb338f4fa69ba')
+depends=('sh' 'libxinerama')
+source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz)
+md5sums=('9c46169ed703732ec52ed946c27d84b4')
 
 build(){
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/dmenu-$pkgver-xft.diff
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 XFTINC=-I/usr/include/freetype2
+  make \
+    X11INC=/usr/include/X11 \
+    X11LIB=/usr/lib/X11
 }
 
 package() {
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index e0f5f37ca..047c2dd8b 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61481 2012-01-01 10:15:29Z schiv $
+# $Id: PKGBUILD 69642 2012-04-20 22:20:38Z tdziedzic $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=gammu
 pkgver=1.31.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU All Mobile Management Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wammu.eu/"
@@ -21,7 +21,11 @@ md5sums=('9b1ff5d84730f025802b961ab9f26717')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # bash completion dir change
+  sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt
+
   cmake . -DCMAKE_INSTALL_PREFIX="/usr"
+
   make
 }
 
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD
index 0db178663..630a3e5ab 100644
--- a/community/gecko-mediaplayer/PKGBUILD
+++ b/community/gecko-mediaplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61721 2012-01-06 22:32:47Z lfleischer $
+# $Id: PKGBUILD 69616 2012-04-20 13:43:38Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: fancris3 <fancris3 at aol.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gecko-mediaplayer
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk')
 makedepends=('xulrunner' 'pkgconfig')
 replaces=('mplayer-plugin')
 source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1a96daf878d06452c0fd9a13fd186021')
+md5sums=('7675c8622c47ff8ccd22b685c48635f8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD
index 0704b7726..8141da27f 100644
--- a/community/gmtk/PKGBUILD
+++ b/community/gmtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 69612 2012-04-20 13:39:41Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=gmtk
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.'
 arch=('i686' 'x86_64')
 url='http://gmtk.googlecode.com/'
@@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf')
 makedepends=('intltool' 'pkg-config')
 options=(!libtool)
 source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e06e9ca8d61d74910343bb3ef4348f7f')
+md5sums=('6bf1c63788541272717f63ec370f6b6c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index 1c8a08716..028e43ded 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61719 2012-01-06 22:32:00Z lfleischer $
+# $Id: PKGBUILD 69614 2012-04-20 13:41:25Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gnome-mplayer
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc='A simple MPlayer GUI.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk')
 makedepends=('gnome-power-manager' 'nautilus')
 install="${pkgname}.install"
 source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1d3ab24c5501b5528e357931ca4dc6da')
+md5sums=('c1fc23faf70f3bbc23daf60f9b34832d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 23dd8c8c0..ff3cd3f8f 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68945 2012-04-06 12:14:22Z arodseth $
+# $Id: PKGBUILD 69644 2012-04-20 22:36:38Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
@@ -9,7 +9,7 @@
 
 pkgname=go
 pkgver=1
-pkgrel=5
+pkgrel=6
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
@@ -62,7 +62,7 @@ package() {
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/go/LICENSE"
   install -Dm644 misc/bash/go \
-    "$pkgdir/etc/bash_completion.d/go"
+    "$pkgdir/usr/share/bash-completion/completions/go"
   install -Dm644 misc/emacs/go-mode-load.el \
     "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el"
   install -Dm644 misc/emacs/go-mode.el \
diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD
index 00ed1b3ac..b3f9f7eaa 100644
--- a/community/portaudio_cpp/PKGBUILD
+++ b/community/portaudio_cpp/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 55337 2011-09-10 02:09:27Z ebelanger $
+# $Id: PKGBUILD 69618 2012-04-20 13:57:47Z lfleischer $
 # Maintainer: Bob Finch <w9ya@qrparci.net>
 
 pkgname=portaudio_cpp
-pkgver=19_20110326
+pkgver=19_20111121
 pkgrel=1
-pkgdesc="PortAudio c++ bindings"
+pkgdesc='PortAudio C++ bindings'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.portaudio.com/"
+url='http://www.portaudio.com/'
 license=('custom')
 depends=("portaudio=${pkgver}" 'gcc-libs')
 options=('!libtool')
-source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz)
-md5sums=('8f266ce03638419ef46e4efcb0fabde6')
+source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz")
+md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
 
 build() {
   cd "$srcdir/portaudio"
+
   ./configure --prefix=/usr --enable-cxx
   make 
 }
 
 package() {
   cd "$srcdir/portaudio/bindings/cpp"
-  make DESTDIR=$pkgdir install
-  install -D -m644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm0644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index 278491ba3..676001e99 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64353 2012-02-11 23:23:45Z allan $
+# $Id: PKGBUILD 69634 2012-04-20 19:51:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
 pkgver=3.0.19
-pkgrel=2
+pkgrel=3
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.privoxy.org'
@@ -23,7 +23,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src
         'privoxy.conf.d')
 md5sums=('57acc79059565cc42eda67982842785d'
          '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
-         '79480f311313cc43974f6cbe6b672927'
+         'fc3046377137003726a151ee27b142a2'
          '27830ef79418e277b90c1c1fa933f876')
 
 build() {
diff --git a/community/privoxy/privoxy.logrotate.d b/community/privoxy/privoxy.logrotate.d
index 386766c3e..8c3129024 100644
--- a/community/privoxy/privoxy.logrotate.d
+++ b/community/privoxy/privoxy.logrotate.d
@@ -1,4 +1,4 @@
-/var/log/privoxy/* {
+/var/log/privoxy/logfile {
    create 660 root privoxy
    notifempty
    compress
diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD
index a1ac5584b..1769c6e41 100644
--- a/community/qtspim/PKGBUILD
+++ b/community/qtspim/PKGBUILD
@@ -1,8 +1,9 @@
+# $Id: PKGBUILD 69610 2012-04-20 10:56:45Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=qtspim
-pkgver=9.1.5
+pkgver=9.1.7
 pkgrel=1
 pkgdesc="New user interface for spim, a MIPS simulator."
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ makedepends=('subversion')
 
 __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator"
 __svnmod=('QtSpim' 'CPU' 'Documentation' 'Setup')
-__svnrev=592
+__svnrev=598
 
 build() {
   cd "$srcdir"
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index 59f678395..fc885474f 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69552 2012-04-18 09:36:36Z lfleischer $
+# $Id: PKGBUILD 69632 2012-04-20 19:47:13Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
-pkgver=4.52
+pkgver=4.53
 pkgrel=2
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,10 +18,10 @@ source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'stunnel.rc.d'
         'stunnel.tmpfiles.conf')
 
-md5sums=('f5e713dda0e8efa659f372832ecd0c2c'
-         '3e84d222525e724788d3c2b29b899610'
+md5sums=('ab3bfc915357d67da18c73f73610d593'
+         'ea8d7637e072fa1bb8706c85e6ea0152'
          'f15398497e10e080c2406d2fc541660c'
-         'd42a1dda7b44aab73fba670fbcfcc8a6'
+         '4c7e3634a9d4dc040102f5d4160fb123'
          '2e065a39998e57727ee79887bbd1751e')
 
 build() {
diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d
index ee67e20ce..76f7b796a 100644
--- a/community/stunnel/stunnel.rc.d
+++ b/community/stunnel/stunnel.rc.d
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-pidfile=/var/run/stunnel.pid
+pidfile=/var/run/stunnel/stunnel.pid
 if [[ -r $pidfile ]]; then
   read -r PID < "$pidfile"
   if [[ $PID && ! -d /proc/$PID ]]; then
diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD
new file mode 100644
index 000000000..b81f4a552
--- /dev/null
+++ b/community/xmlstarlet/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 69626 2012-04-20 16:57:50Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: PyroPeter <abi1789@googlemail.com>
+# Contributor: BlackEagle <ike.devolder@scarlet.be>
+# Contributor: chochem <chochem@gmail.com>
+
+pkgname=xmlstarlet
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
+arch=('i686' 'x86_64')
+url="http://xmlstar.sourceforge.net/"
+license=('MIT')
+depends=('libxslt>=1.1.9')
+source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download")
+md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  local xsltlibs=$(pkg-config --libs libxslt libexslt)
+  local xmllibs=$(pkg-config --libs libxml-2.0)
+
+  LIBXSLT_PREFIX=/usr \
+	LIBXML_PREFIX=/usr \
+	LIBXSLT_LIBS="${xsltlibs}" \
+	LIBXML_LIBS="${xmllibs}" \
+	./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm0644 Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING
+  ln -s xml ${pkgdir}/usr/bin/xmlstarlet
+}
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
new file mode 100644
index 000000000..a437fa806
--- /dev/null
+++ b/extra/calligra/PKGBUILD
@@ -0,0 +1,272 @@
+# $Id: PKGBUILD 156552 2012-04-20 19:21:46Z andrea $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=calligra
+pkgname=('calligra-filters'
+         'calligra-interfaces'
+         'calligra-libs'
+         'calligra-plugins'
+         'calligra-pics'
+         'calligra-servicetypes'
+         'calligra-templates'
+         'calligra-tools'
+         'calligra-karbon'
+         'calligra-kexi'
+         'calligra-kounavail'
+         'calligra-plan'
+         'calligra-stage'
+         'calligra-krita'
+         'calligra-sheets'
+         'calligra-words'
+         'calligra-handbook'
+         'calligra-braindump'
+         'calligra-flow')
+pkgver=2.4.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.calligra-suite.org/'
+license=('FDL1.2' 'GPL2' 'LGPL')
+makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
+             'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
+             'kdegraphics-okular' 'gsl' 'kdeedu-marble'
+             'libwpd' 'libwpg' 'pstoedit' 'glew'
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
+groups=('calligra')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        'do-not-build-hancomword.patch'
+        'fix-docx-support.patch')
+md5sums=('a45b9141c6bb750569e8f6554197dd50'
+         'cc1a5fba43426003909751035d093362'
+         'b694e3af26a31c36488d869f9331090c')
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch
+  patch -p1 -i "${srcdir}"/fix-docx-support.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_active=OFF \
+    -DBUILD_mobile=OFF \
+    -DIHAVEPATCHEDQT=1
+  make
+}
+
+package_calligra-filters() {
+  pkgdesc="Filters for the Calligra office suite"
+  optdepends=('libwpg: Corel WordPerfect Graphics image importer')
+  conflicts=('koffice-filters')
+  replaces=('koffice-filters')
+  install=calligra-filters.install
+
+  cd "${srcdir}"/build/filters
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-interfaces() {
+  pkgdesc="Interfaces for the Calligra office suite"
+  depends=('calligra-libs')
+  conflicts=('koffice-interfaces')
+  replaces=('koffice-interfaces')
+
+  cd "${srcdir}"/build/interfaces
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-libs() {
+  pkgdesc="Libraries for the Calligra office suite"
+  depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes')
+  conflicts=('koffice-libs')
+  replaces=('koffice-libs')
+
+  cd "${srcdir}"/build/libs
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-plugins() {
+  pkgdesc="Plugins for the Calligra office suite"
+  depends=('calligra-libs' 'calligra-filters')
+  optdepends=('kdeedu-marble: map shape for Calligra')
+  conflicts=('koffice-plugins' 'koffice-kchart')
+  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
+
+  cd "${srcdir}"/build/plugins
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-pics() {
+  pkgdesc="Icons for the Calligra office suite"
+  conflicts=('koffice-pics')
+  replaces=('koffice-pics')
+  install=calligra.install
+
+  cd "${srcdir}"/build/pics
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-servicetypes() {
+  pkgdesc="Servicetypes for the Calligra office suite"
+  conflicts=('koffice-servicetypes')
+  replaces=('koffice-servicetypes')
+  install=calligra.install
+
+  cd "${srcdir}"/build/servicetypes
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-templates() {
+  pkgdesc="Templates for the Calligra office suite"
+  conflicts=('koffice-templates')
+  replaces=('koffice-templates')
+
+  cd "${srcdir}"/build/templates
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-tools() {
+  pkgdesc="Tools for the Calligra office suite"
+  depends=('calligra-libs')
+  conflicts=('koffice-tools')
+  replaces=('koffice-tools')
+  install=calligra-tools.install
+
+  cd "${srcdir}"/build/tools
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-karbon() {
+  pkgdesc="Create scalable vector drawings"
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-tools: extra calligra tools')
+  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
+  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
+  install=calligra-karbon.install
+
+  cd "${srcdir}"/build/karbon
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-kexi() {
+  pkgdesc="Develop desktop database applications"
+  depends=('calligra-libs' 'calligra-templates')
+  optdepends=('libmysqlclient: MySQL driver'
+              'libpqxx: PostgreSQL driver'
+              'freetds: Sybase & MS SQL driver'
+              'xbase: XBase driver'
+              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
+              'kdeedu-marble: map form widget'
+              'calligra-plugins: extra calligra plugins')
+  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
+  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
+  install=calligra-kexi.install
+
+  cd "${srcdir}"/build/kexi
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-kounavail() {
+  pkgdesc="Unavailable Calligra Document"
+  depends=('calligra-libs')
+  conflicts=('koffice-kounavail')
+  replaces=('koffice-kounavail')
+
+  cd "${srcdir}"/build/kounavail
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-plan() {
+  pkgdesc="Calligra Project Management Component"
+  depends=('calligra-words')
+  conflicts=('koffice-kplato' 'calligra-kplato')
+  replaces=('koffice-kplato' 'calligra-kplato')
+  install=calligra-plan.install
+
+  cd "${srcdir}"/build/plan
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-stage() {
+  pkgdesc="Write presentation documents"
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-plugins: extra calligra plugins')
+  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
+  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
+  install=calligra-stage.install
+
+  cd "${srcdir}"/build/stage
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-krita() {
+  pkgdesc="Edit and paint images"
+  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime'
+           'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw')
+  conflicts=('koffice-krita' 'calligra-krita-doc')
+  replaces=('koffice-krita' 'calligra-krita-doc')
+  install=calligra-krita.install
+
+  cd "${srcdir}"/build/krita
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-sheets() {
+  pkgdesc="Write spreadsheet documents"
+  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-plugins: extra calligra plugins'
+              'calligra-tools: extra calligra tools')
+  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  install=calligra-sheets.install
+
+  cd "${srcdir}"/build/sheets
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-words() {
+  pkgdesc="Word Processor"
+  depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail'
+           'calligra-plugins' 'kdegraphics-okular')
+  optdepends=('calligra-tools: extra calligra tools')
+  conflicts=('koffice-kword')
+  replaces=('koffice-kword')
+  install=calligra-words.install
+
+  cd "${srcdir}"/build/words
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-handbook() {
+  pkgdesc="Documentation for Calligra"
+  conflicts=('koffice-handbook')
+  replaces=('koffice-handbook')
+
+  cd "${srcdir}"/build/doc/calligra
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-braindump() {
+  pkgdesc="Notes and idea gathering"
+  depends=('calligra-libs' 'kdebase-runtime')
+  install=calligra-braindump.install
+
+  cd "${srcdir}"/build/braindump
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-flow() {
+  pkgdesc="Flowchart & Diagram Editing"
+  depends=('calligra-libs' 'kdebase-runtime')
+  conflicts=('calligra-flow-doc')
+  replaces=('calligra-flow-doc')
+  install=calligra-flow.install
+
+  cd "${srcdir}"/build/flow
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/calligra/calligra-braindump.install b/extra/calligra/calligra-braindump.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/extra/calligra/calligra-braindump.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/extra/calligra/calligra-filters.install b/extra/calligra/calligra-filters.install
new file mode 100644
index 000000000..7c8a8bd2b
--- /dev/null
+++ b/extra/calligra/calligra-filters.install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-flow.install b/extra/calligra/calligra-flow.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/calligra/calligra-flow.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-karbon.install b/extra/calligra/calligra-karbon.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/extra/calligra/calligra-karbon.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/extra/calligra/calligra-kexi.install b/extra/calligra/calligra-kexi.install
new file mode 100644
index 000000000..b8c7ebf27
--- /dev/null
+++ b/extra/calligra/calligra-kexi.install
@@ -0,0 +1,11 @@
+post_install() {
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-krita.install b/extra/calligra/calligra-krita.install
new file mode 100644
index 000000000..33d234a02
--- /dev/null
+++ b/extra/calligra/calligra-krita.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/extra/calligra/calligra-plan.install b/extra/calligra/calligra-plan.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/extra/calligra/calligra-plan.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/extra/calligra/calligra-sheets.install b/extra/calligra/calligra-sheets.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/calligra/calligra-sheets.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-stage.install b/extra/calligra/calligra-stage.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/calligra/calligra-stage.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-tools.install b/extra/calligra/calligra-tools.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/calligra/calligra-tools.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra-words.install b/extra/calligra/calligra-words.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/calligra/calligra-words.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/calligra.install b/extra/calligra/calligra.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/calligra/calligra.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/calligra/do-not-build-hancomword.patch b/extra/calligra/do-not-build-hancomword.patch
new file mode 100644
index 000000000..0c010b706
--- /dev/null
+++ b/extra/calligra/do-not-build-hancomword.patch
@@ -0,0 +1,11 @@
+--- a/filters/words/CMakeLists.txt
++++ b/filters/words/CMakeLists.txt
+@@ -75,7 +75,6 @@ IF( NOT TINY )
+         add_subdirectory( docbook )
+ #	    add_subdirectory( html )
+ 	    add_subdirectory( kword1.3 )
+-	    add_subdirectory( hancomword )
+ 	    add_subdirectory( oowriter )
+         add_subdirectory( palmdoc )
+ 	    add_subdirectory( wml )
+
diff --git a/extra/calligra/fix-docx-support.patch b/extra/calligra/fix-docx-support.patch
new file mode 100644
index 000000000..304e200e3
--- /dev/null
+++ b/extra/calligra/fix-docx-support.patch
@@ -0,0 +1,18 @@
+--- a/libs/odf/KoXmlWriter.h
++++ b/libs/odf/KoXmlWriter.h
+@@ -252,6 +252,14 @@ private:
+         Tag(const char* t = 0, bool ind = true)
+                 : tagName(t), hasChildren(false), lastChildIsText(false),
+                 openingTagClosed(false), indentInside(ind) {}
++        Tag(const Tag &original)
++        {
++            tagName = original.tagName;
++            hasChildren = original.hasChildren;
++            lastChildIsText = original.lastChildIsText;
++            openingTagClosed = original.openingTagClosed;
++            indentInside = original.indentInside;
++        }
+         const char* tagName;
+         bool hasChildren : 1; ///< element or text children
+         bool lastChildIsText : 1; ///< last child is a text node
+
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 0f66c70a2..6c5f1296d 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148694 2012-02-05 11:47:14Z ibiru $
+# $Id: PKGBUILD 156562 2012-04-21 01:56:35Z eric $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
-pkgver=1.0
-pkgrel=2
+pkgver=1.3
+pkgrel=1
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL' 'MIT')
@@ -16,15 +16,17 @@ optdepends=('python2: for python plug-ins'
             'ghostscript: for pdf plug-ins')
 options=('!libtool')
 install=cinepaint.install
-source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch)
-md5sums=('7dfdb005d246578392ac9bd500534804'
-         '169085743f667c250ea2e4022efecf5f'
-         '682de65ad358512d00a8b76730453664')
+source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
+        LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
+sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
+          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
+          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
+          'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
 
 build() {
   cd "${srcdir}/${pkgname}"
   patch -p1 -i ../cinepaint-libpng15.patch
+  patch -p1 -i ../cinepaint-missing-include.patch
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
   sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
 
diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch
new file mode 100644
index 000000000..ed159213a
--- /dev/null
+++ b/extra/cinepaint/cinepaint-missing-include.patch
@@ -0,0 +1,11 @@
+diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
+@@ -32,6 +32,7 @@
+ 
+ #include <list>
+ #include <string>
++#include <unistd.h>
+ 
+ #include "icc_modell_beobachter.h"
+ 
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 9a59b190d..65ccfb0fe 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 146707 2012-01-16 19:49:18Z dreisner $
+# $Id: PKGBUILD 156521 2012-04-20 06:48:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.7
-pkgrel=2
+pkgver=2.8.8
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.cmake.org/"
 license=('custom')
-url="http://www.cmake.org"
 depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e1b237aeaed880f65dec9c20602452f6')
+md5sums=('ba74b22c788a0c8547976b880cd02b17')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -24,7 +24,7 @@ build() {
     --docdir=/share/doc/cmake \
     --system-libs \
     --qt-gui \
-    --parallel=2
+    --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
   make
 }
 
@@ -36,5 +36,6 @@ package() {
   install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
   install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
   install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+
   install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 3cfb2ac1a..0eb1a83c1 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=ruby
-pkgver=1.9.3_p125
-pkgrel=4
+pkgver=1.9.3_p194
+pkgrel=1
 pkgdesc='An object-oriented language for quick and easy programming'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
@@ -21,7 +21,7 @@ options=('!emptydirs' '!makeflags')
 install='ruby.install'
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('702529a7f8417ed79f628b77d8061aa5'
+md5sums=('2278eff4cfed3cbc0653bc73085caa34'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index 0c85faa38..b83757b06 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141959 2011-11-03 17:33:58Z eric $
+# $Id: PKGBUILD 156566 2012-04-21 02:58:41Z eric $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-clipman-plugin
-pkgver=1.2.2
-pkgrel=1.1
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="A clipboard plugin for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('60df7769a8271d7fcab177210f4291e8')
+md5sums=('61f3be97efa379cb358980c94e14692a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index 8deb2c6f7..d55bd499b 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 149256 2012-02-06 16:36:25Z foutrelis $
+# $Id: PKGBUILD 156568 2012-04-21 03:24:10Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-systemload-plugin
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A system load plugin for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
-makedepends=('pkgconfig' 'intltool')
+depends=('xfce4-panel>=4.7.4')
+makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('da4f0e8bfb57e18fe3e3e56507a681f7')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('130ad7befddd8705ca09a98e9cee5c3e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index 7bd0dd691..385fe624f 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 149258 2012-02-06 16:37:33Z foutrelis $
+# $Id: PKGBUILD 156570 2012-04-21 03:56:43Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=xfce4-time-out-plugin
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Take a break from your computer with this plugin for XFCE4."
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 license=('GPL')
-depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel>=4.7.0')
 makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
-md5sums=('ef50a3fd45c169943acc8af93604d9fd')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('b6e4a3145d31c341e2506fb17b014587')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -29,7 +29,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD
new file mode 100644
index 000000000..5d8a2e4cb
--- /dev/null
+++ b/~emulatorman/jitsi/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=jitsi
+pkgver=1.0.3967
+pkgrel=1
+pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
+arch=('i686' 'x86_64')
+url="http://jitsi.org"
+license=('LGPL')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+options=(!strip !emptydirs zipman !libtool docs)
+source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.zip"
+	jitsi.desktop
+	jitsi.sh)
+md5sums=('0fb7aaaad551177c3037ae570ca2f2e1'
+	'aad7cf1fb18ff5d7c964834ecc38aed8'
+	'c75c74f41e613a7d17bf2f1f310adee3')
+
+build()
+{
+	cd ${srcdir}/${pkgname}
+	# append the build revision to the jitsi version
+	sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+	. /etc/profile.d/apache-ant.sh
+	ant rebuild
+}
+
+package() {
+	cd ${srcdir}/${pkgname}
+	find lib/ lib/bundle/ -maxdepth 1 -type f \
+		-exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
+	find lib/os-specific/linux/ -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
+	shopt -sq extglob
+	find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+	find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
+		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+	install -Dm755 "$srcdir/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm644 "$srcdir/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	local _file
+	for _file in resources/install/debian/*.{svg,xpm}; do
+		install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${pkgname}${_file/*sip-communicator/}"
+	done
+}
diff --git a/~emulatorman/jitsi/jitsi.desktop b/~emulatorman/jitsi/jitsi.desktop
new file mode 100644
index 000000000..dd4de82a6
--- /dev/null
+++ b/~emulatorman/jitsi/jitsi.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Jitsi
+GenericName=jitsi
+Comment=VoIP and Instant Messaging client
+Icon=/usr/share/pixmaps/jitsi.svg
+Type=Application
+Categories=Network
+Exec=/usr/bin/jitsi
+Terminal=false
diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh
new file mode 100644
index 000000000..c78c69f2f
--- /dev/null
+++ b/~emulatorman/jitsi/jitsi.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+CLIENTARGS=""
+arch | grep i686 && CLIENTARGS="-client -Xmx256m"
+
+javabin=${JAVA_HOME}/bin/java
+
+SCDIR=/usr/lib/jitsi
+LIBPATH=$SCDIR/lib
+CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar
+FELIX_CONFIG=$LIBPATH/felix.client.run.properties
+LOG_CONFIG=$LIBPATH/logging.properties
+COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
+
+cd $SCDIR
+
+exec $COMMAND $*
+
diff --git a/~mtjm/python2-openid/PKGBUILD b/~mtjm/python2-openid/PKGBUILD
new file mode 100644
index 000000000..31cdf3290
--- /dev/null
+++ b/~mtjm/python2-openid/PKGBUILD
@@ -0,0 +1,19 @@
+# Based on https://aur.archlinux.org/packages.php?ID=12562
+# Contributor: Ryan Coyner <rcoyner@gmail.com>
+# Maintainer: Laszlo Papp <dj szapi at archlinux us>
+pkgname=python2-openid
+pkgver=2.2.5
+pkgrel=1
+pkgdesc="OpenID library for Python"
+arch=('any')
+url="http://www.openidenabled.com/openid/libraries/python"
+license=('Apache')
+depends=('python2')
+source=("http://pypi.python.org/packages/source/p/python-openid/python-openid-${pkgver}.tar.gz")
+md5sums=('393f48b162ec29c3de9e2973548ea50d')
+
+build() {
+    cd "${srcdir}/python-openid-${pkgver}"
+    python2 setup.py build || return 1
+    python2 setup.py install --root=$pkgdir || return 1
+}