28 files changed, 224 insertions, 131 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 773c4e06e..1a955558f 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $
+# $Id: PKGBUILD 152198 2012-03-05 08:55:37Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('804309dca70ede35b4a654ab764e9079')
+md5sums=('54e0556d73c22c7b3393069071e0b717')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index e73bdd8f0..5471577cb 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144043 2011-12-02 20:54:10Z ibiru $
+# $Id: PKGBUILD 152200 2012-03-05 08:55:44Z ibiru $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
@@ -15,15 +15,18 @@ makedepends=('cmake' 'boost')
 install=avogadro.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch')
+        'fix-boost.patch'
+        'fix-opengl-headers.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
          'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec')
+         '46282e4709429447e44a0a54d51ad2ec'
+         'f420bfd22e3d5d8fcddc625cf5e711f6')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
   patch -p1 -i "${srcdir}"/fix-boost.patch
+  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
 
   cd "${srcdir}"
   mkdir build
diff --git a/extra/avogadro/fix-opengl-headers.patch b/extra/avogadro/fix-opengl-headers.patch
new file mode 100644
index 000000000..e6e8bc3b5
--- /dev/null
+++ b/extra/avogadro/fix-opengl-headers.patch
@@ -0,0 +1,53 @@
+--- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
++++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
+@@ -25,6 +25,8 @@
+ #include "camera.h"
+ #include "glwidget.h"
+ #include <avogadro/molecule.h>
++#include <Eigen/LU>
++#include <GL/glu.h>
+ 
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
++++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
+@@ -42,6 +42,7 @@
+ #include <QColor>
+ #include <QVarLengthArray>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
++++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
+@@ -70,6 +70,8 @@
+ 
+ #include <openbabel/mol.h>
+ 
++#include <GL/glu.h>
++
+ using namespace OpenBabel;
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
++++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
+@@ -36,6 +36,7 @@
+ #include <QFile>
+ #include <QDebug>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
++++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
+@@ -44,6 +44,8 @@
+ #include <QComboBox>
+ #include <QDebug>
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 28132c5ca..6e2a5dc6b 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150898 2012-02-23 13:54:59Z allan $
-# Maintainer:
+# $Id: PKGBUILD 152235 2012-03-05 13:54:25Z andrea $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.98
-pkgrel=3
+pkgrel=4
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -13,28 +13,32 @@ license=('GPL2')
 depends=('dbus-core')
 makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
 optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-	"alsa-lib: Audio bluetooth devices support"
-	"dbus-python: to run bluez-simple-agent"
-	"pygobject: to run bluez-simple-agent"
-	"libusb-compat: USB adapters support"
-        "cups: CUPS backend")
+            "alsa-lib: Audio bluetooth devices support"
+            "dbus-python: to run bluez-simple-agent"
+            "pygobject: to run bluez-simple-agent"
+            "libusb-compat: USB adapters support"
+            "cups: CUPS backend")
 conflicts=('bluez-libs' 'bluez-utils')
 provides=('bluez-libs' 'bluez-utils')
 replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool' 'emptydirs')
+options=('!libtool')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch')
+        'bluetooth.conf.d' 'rc.bluetooth'
+        'fix-a2dp.patch'
+        'fix-compile-issue.patch')
 md5sums=('4aca8a0929250212e9a75fb60dd75b05'
          '7412982b440f29fa7f76a41a87fef985'
          '8f9498707f809506928b2e480d3b6789'
-         'd6a34317e56b7c2bd990791d89d6c3cb')
+         'd6a34317e56b7c2bd990791d89d6c3cb'
+         'd81860cd0d7c3ddd2515591453a85e65')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/fix-a2dp.patch"
+  patch -p1 -i "${srcdir}/fix-a2dp.patch"
+  patch -p1 -i "${srcdir}/fix-compile-issue.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch
new file mode 100644
index 000000000..ddb5d94e8
--- /dev/null
+++ b/extra/bluez/fix-compile-issue.patch
@@ -0,0 +1,50 @@
+From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
+From: Patrick Ohly <patrick.ohly@intel.com>
+Date: Mon, 16 Jan 2012 11:11:55 +0100
+Subject: [PATCH] lib: Fix compile issue when using in C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The compiler error is:
+ /usr/include/bluetooth/bluetooth.h::131:9:âerror:âinvalidâconversion fromâ'void*'âtoâ'bt_get_le64(void*)::<anonymousâstruct>*'
+ ...
+
+The reason is that C++, in contrast to C, does not allow conversion of
+void * to anything, and this code gets compiled as C++ when the app is
+written in C++. The macro with the assignment itself is older, but only
+recent Bluez starts to use it in inline functions, thus triggering the
+problem.
+
+This patch keeps the "struct __attribute__((packed))" magic and merely
+changes the typecast so that it works in C and C++. Like the existing
+macro this patch relies on support for typeof.
+---
+ lib/bluetooth.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bluetooth.h b/lib/bluetooth.h
+index ea7373d..0541842 100644
+--- a/lib/bluetooth.h
++++ b/lib/bluetooth.h
+@@ -141,7 +141,7 @@ enum {
+ ({						\
+ 	struct __attribute__((packed)) {	\
+ 		typeof(*(ptr)) __v;		\
+-	} *__p = (void *) (ptr);		\
++	} *__p = (typeof(__p)) (ptr);		\
+ 	__p->__v;				\
+ })
+ 
+@@ -149,7 +149,7 @@ enum {
+ do {						\
+ 	struct __attribute__((packed)) {	\
+ 		typeof(*(ptr)) __v;		\
+-	} *__p = (void *) (ptr);		\
++	} *__p = (typeof(__p)) (ptr);		\
+ 	__p->__v = (val);			\
+ } while(0)
+ 
+-- 
+1.7.6.5
+
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 8efad5ecc..d30c8a2e5 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144045 2011-12-02 20:54:13Z ibiru $
+# $Id: PKGBUILD 152202 2012-03-05 08:55:53Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,19 +6,17 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.48.0
+pkgver=1.49.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        exceptions.patch
-        BOOST_FOREACH.patch)
+        exceptions.patch)
 license=('custom')
-md5sums=('313a11e97eb56eb7efd18325354631be'
-         '9b44c28b36303152050c8c82469569c5'
-         '2db6098a1a39bced4c6162eb46418320')
+md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
+         '9b44c28b36303152050c8c82469569c5')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -32,8 +30,6 @@ build() {
   cd "${srcdir}"/${pkgbase}_${_boostver}
   # https://svn.boost.org/trac/boost/ticket/5731
   patch -p0 -i "${srcdir}/exceptions.patch"
-  # https://svn.boost.org/trac/boost/ticket/6131
-  patch -p2 -i "${srcdir}/BOOST_FOREACH.patch"
 
 
   # build bjam
@@ -86,7 +82,8 @@ package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
     optdepends=('python: for python bindings'
-                'python2: for python2 bindings')
+                'python2: for python2 bindings'
+		'boost-build: to use boost jam for building your project.')
 
     install -d "${pkgdir}"/usr/{include,lib,share}
     # headers/source files
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 6751d8023..0d9eb307b 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $
+# $Id: PKGBUILD 152257 2012-03-06 04:01:25Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.59
+pkgver=2.60
 pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc' 'dbus-core')
-makedepends=('libcap>=2.16')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf'
         'etc/conf.d/dnsmasq')
@@ -19,24 +18,27 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
+md5sums=('5a09908e02724d759ac60d9cafd27de8'
          '66479e99123faeab83ebaed709ef95b5'
-         '9f180cc236808bbd02ca8652fd2e8217'
-         'f329d86f8ba1cd85f9b6ee59e0ce3791')
+         '819fbdf6440d710616e6df5f8ca9cdba'
+         '631d8349acbed1b01d4e11d9f42fdb7d')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # link against dbus
-  echo '#define HAVE_DBUS' >> src/config.h
+  # link against dbus. this ugliness is needed to ensure that the
+  # compile time opts report properly on startup. yuck.
+  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ {
+    i#define HAVE_DBUS
+  }' src/config.h
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
 
   install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
   install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service
index b09cb24b9..05a1f0b69 100644
--- a/extra/dnsmasq/dnsmasq.service
+++ b/extra/dnsmasq/dnsmasq.service
@@ -4,8 +4,8 @@ Description=A lightweight DHCP and caching DNS server
 [Service]
 Type=dbus
 BusName=uk.org.thekelleys.dnsmasq
-ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecStartPre=/usr/bin/dnsmasq --test
+ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
index 0ce736ba9..4030c2896 100755
--- a/extra/dnsmasq/rc.dnsmasq
+++ b/extra/dnsmasq/rc.dnsmasq
@@ -7,7 +7,7 @@
 checkconfig() {
   local testout
 
-  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+  if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
     echo "$testout"
     return 1
   fi
@@ -29,7 +29,7 @@ case $1 in
   start)
     stat_busy "Starting DNS/DHCP daemon"
     if [[ -z $PID ]] && checkconfig &&
-        /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
+        /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
                           "--pid-file=$pidfile" \
                           "${DNSMASQ_OPTS[@]}"; then
       add_daemon dnsmasq
@@ -56,7 +56,7 @@ case $1 in
     ;;
   checkconfig)
     # diagnostics will be printed, with zero/non-zero exit
-    /usr/sbin/dnsmasq --test
+    /usr/bin/dnsmasq --test
     ;;
   *)
     echo "usage: $0 <start|stop|restart|checkconfig>"
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 12d999c2d..a93063aa6 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 144047 2011-12-02 20:54:17Z ibiru $
+# $Id: PKGBUILD 152204 2012-03-05 08:55:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index b44b06169..9bcf7326c 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148780 2012-02-05 11:50:09Z ibiru $
+# $Id: PKGBUILD 152206 2012-03-05 08:55:59Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
@@ -14,12 +14,13 @@ depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
          'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
 makedepends=('zip' 'cmake' 'boost' 'tclap')
 install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
 
 build() {
   cd "${srcdir}"
-  mkdir build && cd build
+  mkdir build
+  cd build
   cmake "${srcdir}/${pkgname}-${pkgver}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 918685dca..56665db73 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151699 2012-02-29 23:23:35Z stephane $
+# $Id: PKGBUILD 152254 2012-03-06 02:06:32Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.4
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org/projects/hwloc/"
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023')
+sha1sums=('911d2ba77fa968c3c72caf75a9e21637f3677acc')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index eb43fb3bc..e934d4e4e 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152071 2012-03-04 14:42:26Z andrea $
+# $Id: PKGBUILD 152208 2012-03-05 08:56:03Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64')
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 7c0def524..0d8a0852f 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152080 2012-03-04 14:47:21Z andrea $
+# $Id: PKGBUILD 152210 2012-03-05 08:56:07Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
 arch=('i686' 'x86_64')
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 19099c355..df2513423 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 144053 2011-12-02 20:54:26Z ibiru $
+# $Id: PKGBUILD 152212 2012-03-05 08:56:10Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
-pkgver=20100913
-pkgrel=6
+pkgver=20110829
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
 makedepends=('doxygen' 'qt' 'boost')
 replaces=('liborigin')
 provides=('liborigin')
-source=(http://download.berlios.de/qtiplot/${pkgbase}-13092010.zip
+source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
 	liborigin.pro.archlinux
 	http://tree.phi-sci.com/tree.hh)
-md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375'
-         '2b19f7a4bd120f6d689edc327468e48e'
-         '966ef25cb42d192a694a71eedf484c1c')
+sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
+          '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d'
+          '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86')
 
 build() {
 	cd "${srcdir}/${pkgbase}"
 
-	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin.pro
+	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
         install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin.pro QMAKESPEC=linux-g++
+	qmake liborigin2.pro QMAKESPEC=linux-g++
   	make QTDIR=/usr/ QMAKESPEC=linux-g++
 
 	 # create documentation
diff --git a/extra/liborigin2/liborigin.pro.archlinux b/extra/liborigin2/liborigin.pro.archlinux
index d338a009c..f0eef7293 100644
--- a/extra/liborigin2/liborigin.pro.archlinux
+++ b/extra/liborigin2/liborigin.pro.archlinux
@@ -1,7 +1,7 @@
-TARGET  	 = origin2
+TARGET           = origin2
 TEMPLATE     = lib
 CONFIG      += warn_on release thread
-#CONFIG      += staticlib 
+#CONFIG      += staticlib
 MOC_DIR      = ./tmp
 OBJECTS_DIR  = ./tmp
 
@@ -11,31 +11,10 @@ DESTDIR      = ./
 LIBS        += -lboost_date_time
 LIBS        += -lboost_thread
 
-HEADERS += endianfstream.hh
-HEADERS += logging.hpp
-HEADERS += OriginObj.h
-HEADERS += OriginFile.h
-HEADERS += OriginParser.h
-HEADERS += OriginDefaultParser.h
-HEADERS += Origin600Parser.h
-HEADERS += Origin610Parser.h
-HEADERS += Origin700Parser.h
-HEADERS += Origin750Parser.h
-HEADERS += Origin800Parser.h
-HEADERS += Origin810Parser.h
-
-SOURCES += OriginFile.cpp
-SOURCES += OriginParser.cpp
-SOURCES += OriginDefaultParser.cpp
-SOURCES += Origin600Parser.cpp
-SOURCES += Origin610Parser.cpp
-SOURCES += Origin700Parser.cpp
-SOURCES += Origin750Parser.cpp
-SOURCES += Origin800Parser.cpp
-SOURCES += Origin810Parser.cpp
-
 headers.files = \$\$HEADERS
 headers.path = /usr/include/liborigin2
 target.path = /usr/lib
 INSTALLS = target headers
 
+include(liborigin2.pri)
+
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 835fdeb38..29d62949f 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 144055 2011-12-02 20:54:29Z ibiru $
+# $Id: PKGBUILD 152214 2012-03-05 08:56:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.53
-pkgrel=2
+pkgver=0.6.54
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost')
 source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('b8e5972429091fd0e915fd3eb695b68adbe1f7cc')
+sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 9f7b84ac9..858b491b8 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 144057 2011-12-02 20:54:34Z ibiru $
+# $Id: PKGBUILD 152216 2012-03-05 08:56:15Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.9
+pkgver=0.15.10
 pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64')
 license=('custom')
-depends=('boost-libs' 'python2')
+depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('d86eb9d4452d07715a355d3a67312f162d6eff3a')
+sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-python-binding
+  export CFLAGS+=" -fvisibility=hidden"
+  export CXXFLAGS+=" -fvisibility=hidden"
+  ./configure --prefix=/usr \
+      --enable-python-binding \
+      --with-libgeoip=system
   make
 }
 
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index d0998b4fd..5796d139a 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151864 2012-03-03 15:22:53Z giovanni $
+# $Id: PKGBUILD 152218 2012-03-05 08:56:28Z ibiru $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index f404bb70d..cb1bc8c71 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151723 2012-03-01 12:38:32Z giovanni $
+# $Id: PKGBUILD 152226 2012-03-05 09:23:14Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
 pkgver=2012.02.29
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -17,7 +17,7 @@ build() {
   cd ${srcdir}/live
 
   sed \
-      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \
+      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
       -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
       -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
       -i config.linux
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 58abd3d35..ef3815582 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151657 2012-02-29 20:04:42Z ronald $
+# $Id: PKGBUILD 152233 2012-03-05 13:38:37Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.3
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 55da0fa3c..af17ccf97 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149745 2012-02-09 23:48:35Z giovanni $
+# $Id: PKGBUILD 152222 2012-03-05 08:56:33Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index bcd412b82..4e6c88070 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $
+# $Id: PKGBUILD 152250 2012-03-06 01:50:30Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('python2')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
+sha1sums=('6f56a301859b8f9513141fbeeca3e537e082aa53')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 87ae4ea37..d787fd561 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148896 2012-02-05 11:54:40Z ibiru $
+# $Id: PKGBUILD 152196 2012-03-05 08:20:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.0
-pkgrel=3
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -29,9 +29,9 @@ build()
   cd "${srcdir}/"
   git clone git://git.seabios.org/seabios.git
   cd seabios
-  find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
   make clean
-  make
+  make PYTHON=python2
 }
 
 package() {
@@ -52,5 +52,5 @@ package() {
     done
 
 }
-md5sums=('a64b36067a191451323b0d34ebb44954'
+md5sums=('5efd1091f01e3bc31bfdec27b8edeb00'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index f826584c3..89fb54c23 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151751 2012-03-02 07:58:39Z tpowa $
+# $Id: PKGBUILD 152194 2012-03-05 07:53:46Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=6
+pkgrel=7
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 64ab42751..f4178d806 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145696 2011-12-28 00:18:26Z giovanni $
+# $Id: PKGBUILD 152224 2012-03-05 08:56:36Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index f1112e39d..b4e26c64e 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 140171 2011-10-08 10:04:27Z tpowa $
+# $Id: PKGBUILD 152241 2012-03-05 19:12:45Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.570
+pkgver=1.580
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -210,7 +210,7 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('20b4f488637366c39458b9b93162eff3'
-         'da6bea412a5be8cf82a813078fec5847'
+md5sums=('2aa5378bc3ed6471c460d18e87a06fa3'
+         '43a77243acd519c4efe9577090b59912'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd')
diff --git a/extra/webmin/webmin-config.tar.bz2 b/extra/webmin/webmin-config.tar.bz2
index a51b43dcd..fa343772c 100644
--- a/extra/webmin/webmin-config.tar.bz2
+++ b/extra/webmin/webmin-config.tar.bz2