Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: community-testing/packagekit/PKGBUILD community/bird/PKGBUILD community/camlp5/PKGBUILD community/exim/PKGBUILD community/ibus-table-extraphrase/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-gcc/PKGBUILD community/torcs/PKGBUILD core/db/PKGBUILD core/iproute2/PKGBUILD core/libsasl/PKGBUILD core/openldap/PKGBUILD core/pam/PKGBUILD core/util-linux/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/ffmpeg/PKGBUILD extra/kdelibs/PKGBUILD extra/libreoffice/PKGBUILD extra/php/PKGBUILD extra/postfix/PKGBUILD extra/python-lxml/PKGBUILD extra/rdesktop/PKGBUILD extra/redland/PKGBUILD extra/subversion/PKGBUILD extra/tidyhtml/PKGBUILD extra/transmission/PKGBUILD extra/windowmaker/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-openssl/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-13 14:21:34 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-13 14:21:34 -0300
commit: 4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch)
tree: 69e20048be17aa12e6342ebcafb0cf9cdbfee32d /extra
parent: 149750d28420a7b59fab5501ab9aaca095f6fa46 (diff)
parent: b5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff)
68 files changed, 1536 insertions, 685 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index aa6b6658b..c30eeeefd 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144467 2011-12-06 11:17:39Z giovanni $
+# $Id: PKGBUILD 146505 2012-01-12 07:55:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10688
+pkgver=10708
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('0bb387c6aafa146e75130e1537a64066')
+md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 59c337604..f08fef652 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145331 2011-12-21 20:47:10Z andrea $
+# $Id: PKGBUILD 146457 2012-01-11 15:21:45Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.3.12
-pkgrel=4
+pkgrel=5
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 95651cdbe..f3d91a738 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146410 2012-01-10 21:40:52Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy carrier <geoffroy@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=bluez-hcidump
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('glibc' 'bluez')
+depends=('bluez')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b160f0672276398344eebe9df1b37a2c')
+md5sums=('3c298a8be67099fe227f3e4d9de539d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index ce21d53a7..e2236c950 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146412 2012-01-10 21:47:26Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.96
-pkgrel=3
+pkgver=4.97
+pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,17 +25,21 @@ replaces=('bluez-libs' 'bluez-utils')
 options=('!libtool' 'emptydirs')
 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"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
-        'rc.bluetooth')
-md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
+        'rc.bluetooth'
+        'make-libcheck-optional.patch')
+md5sums=('b302cee7f9b9527d29775449d7e1dfe6'
          '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
+         '8f9498707f809506928b2e480d3b6789'
+         'f112fc5bcaeecc7b6ea994f14786e235')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 -i "${srcdir}"/make-libcheck-optional.patch
+  autoreconf -i -f
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -50,7 +55,8 @@ build() {
     --enable-pand \
     --enable-dund \
     --enable-cups \
-    --enable-wiimote
+    --enable-wiimote \
+    --disable-test
   make
 }
 
diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch
new file mode 100644
index 000000000..a315a3898
--- /dev/null
+++ b/extra/bluez/make-libcheck-optional.patch
@@ -0,0 +1,79 @@
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800)
+Subject: build: Move libcheck under TEST conditional
+X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a
+
+build: Move libcheck under TEST conditional
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 9112483..5cf287c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -449,6 +449,7 @@ endif
+ 
+ unit_objects =
+ 
++if TEST
+ unit_tests = unit/test-eir
+ 
+ noinst_PROGRAMS += $(unit_tests)
+@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
+ unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
+ unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
+ unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
+-unit_test_eir_SHORTNAME = unit
+ unit_objects += $(unit_test_eir_OBJECTS)
++else
++unit_tests =
++endif
+ 
+ TESTS = $(unit_tests)
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 2097d77..753b994 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
+ 		[])
+ ])
+ 
++AC_DEFUN([AC_PATH_CHECK], [
++	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
++	AC_SUBST(CHECK_CFLAGS)
++	AC_SUBST(CHECK_LIBS)
++])
++
+ AC_DEFUN([AC_PATH_OUI], [
+ 	AC_ARG_WITH(ouifile,
+ 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
+@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
+ 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
+ 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
+-	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
++	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
+ 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
+ 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
+ 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
+diff --git a/configure.ac b/configure.ac
+index 3a5dfde..a7670da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,8 +24,6 @@ AC_PROG_YACC
+ AM_PROG_LEX
+ AM_PROG_MKDIR_P
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+-
+ m4_define([_LT_AC_TAGCONFIG], [])
+ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
+ 
+@@ -50,6 +48,7 @@ AC_PATH_UDEV
+ AC_PATH_SNDFILE
+ AC_PATH_OUI
+ AC_PATH_READLINE
++AC_PATH_CHECK
+ 
+ AC_ARG_BLUEZ
+ 
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
index 9c939fe03..371204ff4 100644
--- a/extra/bogofilter/PKGBUILD
+++ b/extra/bogofilter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127873 2011-06-19 06:22:51Z eric $
+# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 pkgname=bogofilter
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast Bayesian spam filtering tool"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD
index 57be5c5d0..fa6a04fe1 100644
--- a/extra/ccache/PKGBUILD
+++ b/extra/ccache/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143717 2011-11-28 16:48:34Z giovanni $
+# $Id: PKGBUILD 146491 2012-01-11 16:49:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ccache
-pkgver=3.1.6
-pkgrel=2
+pkgver=3.1.7
+pkgrel=1
 pkgdesc="A compiler cache"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ccache.samba.org/"
 license=('GPL')
 depends=('zlib')
 source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('343dc9b642e1d2af1e6bd8e474dde92e')
+md5sums=('82257745eac54826527946e9e3d046f4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 6fb5cf1c8..464249d4b 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145085 2011-12-16 15:46:54Z andyrtr $
+# $Id: PKGBUILD 146461 2012-01-11 15:21:50Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 4d7971276..fb52d4dfc 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140376 2011-10-11 21:30:12Z jgc $
+# $Id: PKGBUILD 146463 2012-01-11 15:21:59Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,10 +8,10 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=8.1
+pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 59eb011b1..df7d8cc08 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $
+# $Id: PKGBUILD 146432 2012-01-11 00:54:52Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.11
+pkgver=9.12
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('lcms' 'jasper')
 source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
-sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234'
+sha1sums=('b0110f83692b14940a8e43759d7ccefa77103cc6'
           '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index b3717bb88..a507575d5 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143725 2011-11-28 17:17:42Z giovanni $
+# $Id: PKGBUILD 146517 2012-01-12 10:18:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
 
 pkgname=diffstat
-pkgver=1.54
-pkgrel=3
+pkgver=1.55
+pkgrel=1
 pkgdesc="Display a histogram of diff changes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/diffstat"
 depends=('glibc')
 license=('MIT')
 source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz")
-md5sums=('af08bef2eb37050ceb0c4fddedb2ee36')
+md5sums=('630d5278f1cd874dc3cc68cff3fddecf')
 
 build () {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 48754fefd..88b95f5b2 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142872 2011-11-17 18:34:28Z ibiru $
+# $Id: PKGBUILD 146465 2012-01-11 15:22:02Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.2.3
+pkgrel=2
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
@@ -11,11 +11,11 @@ makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
 options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
@@ -26,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 29fa39fd2..28f1deac6 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142874 2011-11-17 18:34:31Z ibiru $
+# $Id: PKGBUILD 146374 2012-01-09 21:40:58Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439')
+sha256sums=('0c26fb822ced5bca7c6888ade35f47821317fa45e33a93c8a2a81fcb06d6f483')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 2a6e166fc..806163d7f 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140865 2011-10-20 05:42:10Z ibiru $
+# $Id: PKGBUILD 146489 2012-01-11 15:43:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=3.2.1
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('759a73c7c49aaf45a5ea9d846b44e1314e13e78d4bfe959fc3ded311c1c690a2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/evolution --disable-static \
       --with-libdb=/usr --with-krb5=/usr
@@ -24,10 +24,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f $pkgdir/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
index 786ecc16a..852e8feb9 100644
--- a/extra/evolution-groupwise/PKGBUILD
+++ b/extra/evolution-groupwise/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $
+# $Id: PKGBUILD 146487 2012-01-11 15:36:59Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=evolution-groupwise
-pkgver=3.2.1
-pkgrel=1
+pkgver=3.2.3
+pkgrel=2
 pkgdesc="GroupWise connector for evolution"
 arch=(i686 x86_64)
 url="http://projects.gnome.org/evolution/"
@@ -13,14 +13,14 @@ depends=('evolution-data-server' 'gtkhtml4')
 makedepends=(intltool evolution)
 optdepends=('evolution: evolution plugin')
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9972cf6ab05168e2364f7d7af1a5d9dd2bb994ab833fc2aaf926a4390e6b8062')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var  --disable-static
   make
 }
 
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 8dfdf8698..67b3bf47b 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142870 2011-11-17 18:34:24Z ibiru $
+# $Id: PKGBUILD 146376 2012-01-09 21:56:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.2.3
+pkgrel=2
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,11 +15,11 @@ groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib \
@@ -35,11 +35,11 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 02c652099..a9ffd7fae 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144952 2011-12-11 23:12:10Z ibiru $
+# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20111211
+pkgver=20120111
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,14 +14,13 @@ if [ "${CARCH}" = "mips64el" ] ; then
     depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
     makedepends=('git')
 else
-    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvdpau libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-    makedepends=('yasm' 'git')
+    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+    makedepends=('yasm' 'git' 'libvdpau')
 fi
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz
+        revert-enabling-threads.patch
         ffmpeg-loongson.patch)
-md5sums=('75d512bf5137d0b055e54313702ef5fc'
-         '99d412cb539f328dbc37d5ead3407fc7')
 
 build() {
   cd "$srcdir/$pkgname"
@@ -34,6 +33,8 @@ build() {
       extraconf=""
   fi
 
+  patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
+
   ./configure \
     --prefix=/usr \
     --enable-libmp3lame \
diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch
new file mode 100644
index 000000000..dd50332ee
--- /dev/null
+++ b/extra/ffmpeg/revert-enabling-threads.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921
+
+diff --git a/libavcodec/options.c b/libavcodec/options.c
+index 4ac9313..4ac92fd 100644
+--- a/libavcodec/options.c
++++ b/libavcodec/options.c
+@@ -370,7 +370,7 @@ static const AVOption options[]={
+ {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
+ #endif
+ {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+-{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
++{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"},
+ {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
+ {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+ {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 149eb4bc9..fb5541a65 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145348 2011-12-22 00:36:32Z dan $
+# $Id: PKGBUILD 146299 2012-01-08 22:58:11Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.8.1
+pkgver=1.7.8.3
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('198e23e6e50245331590a6159ccdbdbe1792422c'
-          'b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809'
+sha1sums=('e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c'
+          'a6e2b7cff8181ee52a1cc00ebba7b349850d6680'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 2b0820bda..80fd90cbe 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144348 2011-12-04 22:01:25Z eric $
-#  Maintainer: Eric Bélanger <eric@archlinux.org>
+# $Id: PKGBUILD 146281 2012-01-08 05:34:24Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.6.1
-_fmver=1.6.1
+pkgver=1.7.0
+_fmver=1.7.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,14 +15,14 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
 if [ "$CARCH" = "i686" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
             'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
 elif [ "$CARCH" = "x86_64" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
             'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index b55be0e9b..1d68de4ba 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145137 2011-12-17 18:24:13Z ibiru $
+# $Id: PKGBUILD 146295 2012-01-08 17:45:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.4.29
+pkgver=2.4.31
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('gtk-sharp-2' 'pkgconfig')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c85dd7b2ac19754bf687fe8653c3631415b3a2ce70b4365268f03a1bd002ffa5')
+sha256sums=('d9601328ee3d2d5be57ac8397571af4835dba8eb2c68ad224de3ec722a81fd04')
 
 build() {
   # get rid of that .wapi errors in fakeroot
@@ -30,8 +30,4 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  # These are gmime alternatives for the same shareutils tools
-  mv "$pkgdir/usr/bin/uuencode" "$pkgdir/usr/bin/guuencode"
-  mv "$pkgdir/usr/bin/uudecode" "$pkgdir/usr/bin/guudecode"
 }
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 7ffd1595a..907ba7315 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144389 2011-12-05 13:07:33Z ibiru $
+# $Id: PKGBUILD 146319 2012-01-09 17:51:25Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
@@ -14,7 +14,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436')
+sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a')
 
 build(){
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 9f5764c6d..216b2a128 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142883 2011-11-17 18:34:43Z ibiru $
+# $Id: PKGBUILD 146306 2012-01-09 13:55:21Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c')
+sha256sums=('e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 6f2a335b1..72a1e9152 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143753 2011-11-28 20:42:11Z giovanni $
+# $Id: PKGBUILD 146519 2012-01-12 10:34:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.4
-pkgrel=2
+pkgver=1.40.5
+pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/help2man/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4d79dc7cb7c20019c2a3650d35259c45')
+md5sums=('75a7d2f93765cd367aab98986a75f88c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD
index 54cb8a771..c461f329e 100644
--- a/extra/k9copy/PKGBUILD
+++ b/extra/k9copy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145676 2011-12-26 22:21:16Z giovanni $
+# $Id: PKGBUILD 146416 2012-01-10 23:37:32Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=k9copy
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A small utility which allows the copy of DVD under Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://k9copy.sourceforge.net"
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index 5fc44e597..29feeb073 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $
+# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kaffeine
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE media player'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kaffeine.kde.org"
 depends=('kdelibs' 'kdebase-runtime' 'xine-lib')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
+makedepends=('pkg-config' 'cmake' 'automoc4')
+install=kaffeine.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
 
 build() {
-	cd $srcdir
+	cd "$srcdir"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -24,7 +26,6 @@ build() {
 }
 
 package() {
-        cd $srcdir/build
-	make DESTDIR=$pkgdir install
+        cd "$srcdir/build"
+	make DESTDIR="$pkgdir" install
 }
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
diff --git a/extra/kaffeine/kaffeine.install b/extra/kaffeine/kaffeine.install
new file mode 100644
index 000000000..5c501dc49
--- /dev/null
+++ b/extra/kaffeine/kaffeine.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/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 7a1d81709..3c1763aa4 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145651 2011-12-26 11:44:37Z andrea $
+# $Id: PKGBUILD 146420 2012-01-10 23:37:38Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
 pkgver=4.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 461ec74b9..570cad56b 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=4
+pkgrel=5
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,10 +19,11 @@ replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch'
-        'fix-knotify-filepath.patch')
+        'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          '9cb83cb7f6394549354c6837977f9e9529127041')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -33,6 +34,8 @@ build() {
        # https://bugs.kde.org/show_bug.cgi?id=285028
        patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
 
+       patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
new file mode 100644
index 000000000..bdcd39a6c
--- /dev/null
+++ b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
@@ -0,0 +1,32 @@
+From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 5 Jan 2012 10:06:05 +0100
+Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
+
+---
+ cmake/modules/FindXine.cmake |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
+index 37c58c6..d71969a 100644
+--- a/cmake/modules/FindXine.cmake
++++ b/cmake/modules/FindXine.cmake
+@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
+   ${PC_LIBXINE_LIBRARY_DIRS}
+  )
+ 
+-find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
+    HINTS
+    ${PC_LIBXINE_PREFIX}/bin
+ )
+ 
+ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+-   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
++   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
+    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
+       set(XINE_VERSION_OK TRUE)
+       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+-- 
+1.7.8.2
+
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 1b517cee5..097bf9798 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $
+# $Id: PKGBUILD 146314 2012-01-09 15:57:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.29
+pkgver=2.4.30
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -14,18 +14,18 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING
-	git_fixes.diff)
-md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
-         'c722c8406507b7e3a8da7a3030d1d9cf'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1'
-         'aebd5336568090b8ec084fabcfb08071')
+#	git_fixes.diff
+)
+md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
+         'fb8a15bf4aff5646c517373e8277f440'
+         'ba65e71c481b94ef0fb6c23c7f21ffa1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
   # git fixes - currently none
-  patch -Np1 -i ${srcdir}/git_fixes.diff
+#  patch -Np1 -i ${srcdir}/git_fixes.diff
   
   #libtoolize --force
   autoreconf --force --install
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 348c2a795..03bb66953 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -14,7 +14,7 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
  AC_SUBST(PCIACCESS_LIBS)
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,14 +26,13 @@
+@@ -26,7 +26,6 @@
  	$(WARN_CFLAGS) \
  	-I$(top_srcdir) \
  	-I$(top_srcdir)/intel \
@@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
  	$(PCIACCESS_CFLAGS) \
  	-I$(top_srcdir)/include/drm
  
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
+@@ -34,7 +33,6 @@
  libdrm_intel_ladir = $(libdir)
  libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
-+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
+ libdrm_intel_la_LIBADD = ../libdrm.la \
+-	@PTHREADSTUBS_LIBS@ \
+ 	@PCIACCESS_LIBS@ \
+ 	@CLOCK_LIB@
  
- libdrm_intel_la_SOURCES = \
- 	intel_bufmgr.c \
 --- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
 @@ -26,13 +26,12 @@
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index cd4a89a5d..ae2f04677 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 127576 2011-06-16 17:03:09Z andyrtr $
+# $Id: PKGBUILD 146471 2012-01-11 15:22:10Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
 pkgver=1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.etpan.org/"
 license=("custom:etpan")
-depends=('db>=5.2.28' 'libsasl>=2.1.23' 'curl>=7.21.' 'expat>=2.0.1-1')
+depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('5addc766141a0b1d29ee1ca4ba1b6808')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 0e437f36c..3a82e17e4 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145337 2011-12-21 20:47:18Z andrea $
+# $Id: PKGBUILD 146473 2012-01-11 15:22:18Z stephane $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.4.2
 pkgver=3.4.4
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable
index 1005760ac..a25819863 100644
--- a/extra/libreoffice/PKGBUILD.next_stable
+++ b/extra/libreoffice/PKGBUILD.next_stable
@@ -14,45 +14,27 @@ pkgname=('libreoffice-common'
 	'libreoffice-sdk-doc'
 	'libreoffice-writer'
 	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-#	'libreoffice-extension-diagram'
-#	'libreoffice-extension-google-docs'
-#	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-#	'libreoffice-extension-nlpsolver'
-#	'libreoffice-extension-ct2n'
-#	'libreoffice-extension-numbertext'	
-#	'libreoffice-extension-oooblogger'
 	'libreoffice-extension-pdfimport'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-#	'libreoffice-extension-scripting-beanshell'
-#	'libreoffice-extension-scripting-javascript'
-#	'libreoffice-extension-scripting-python'
-#	'libreoffice-extension-typo'
-#	'libreoffice-extension-validator'
-#	'libreoffice-extension-watch-window'
-#	'libreoffice-extension-wiki-publisher'
-)
-_LOver=3.5.0.0
-pkgver=3.5.0beta1
-pkgrel=1
+	'libreoffice-extension-report-builder')
+_LOver=3.4.99.2
+pkgver=3.5.0beta2
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' #'xulrunner' 
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' # 'libldap' 
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'zenity' # for build icon :D
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
+             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'mesa' 'gstreamer0.10-base' 'java-environment'
               #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
+             # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	     'ttf-dejavu') # to satisfy regression tests
 
 # http://download.documentfoundation.org/mirrors/all.html
@@ -61,8 +43,8 @@ makedepends=( # makedepends
 #_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.bz2
-	${_additional_source_url}/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
+	${_additional_source_url}/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -85,31 +67,14 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.bz2
 	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-#	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
 	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-#	${_additional_source_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-#	buildfix_boost.diff
-#	buildfix_ct2n.diff
-#	vbahelper.visibility.patch
-#	scp2-more-reasonable-file-access-rights.diff
-#	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-#	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-)
-
-noextract=(8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
+	fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f)
+noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -136,23 +101,12 @@ noextract=(8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-#	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	#4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
-	#7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	#41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	#451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	#bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	#23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	#b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	#b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	#9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	#dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	#b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+#	cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 )
-md5sums=('bf6ce92d8d69f1dec4836a7249e10436'
-         'a0b19441245d7627c299d7014d110b32'
-         'b9dee0572120c87906ed6e2fb4696b69'
-         '8f107ffb3fc9d9b920b7bbd0bc79c7e8'
+md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69'
+         '31471ad86996629a8c20f3a4d24ee03e'
+         '3146b8522605d24ce4a259fe73ec3519'
+         'a8b25a0bf696fd126a08319d88998492'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -178,7 +132,9 @@ md5sums=('bf6ce92d8d69f1dec4836a7249e10436'
          '0ff7d225d087793c8c2c680d77aac3e7'
          'e1c178b18f130b40494561f02bc1a948'
          '7c2549f6b0a8bb604e6c4c729ffdcfe6'
-         '185d60944ea767075d27247c3162b3bc')
+         '185d60944ea767075d27247c3162b3bc'
+         '60ce5dc9bd098f95c2e621a930c98dd9'
+         'f9bd737527dafd3eeb451cf0dd95d7d6')
 
 build() {
 
@@ -198,24 +154,11 @@ build() {
 	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
 	ln -s ../libreoffice-translations-$_LOver/translations .
 
-#	ln -s ${srcdir}/ext_sources/*Barcode* solver/unxlngx6.pro/bin/Barcode.oxt
-#	ln -s ${srcdir}/ext_sources/*SmART*   solver/unxlngx6.pro/bin/SmART.oxt
-#	ln -s ${srcdir}/ext_sources/*gdocs*   solver/unxlngx6.pro/bin/gdocs.oxt
-#	ln -s ${srcdir}/ext_sources/*hunart*  solver/unxlngx6.pro/bin/hunart.oxt
-#	ln -s ${srcdir}/ext_sources/*numbertext* solver/unxlngx6.pro/bin/numbertext.oxt
-#	ln -s ${srcdir}/ext_sources/*oooblogger* solver/unxlngx6.pro/bin/oooblogger.oxt
-#	ln -s ${srcdir}/ext_sources/*typo* solver/unxlngx6.pro/bin/typo.oxt
-#	ln -s ${srcdir}/ext_sources/*Validator* solver/unxlngx6.pro/bin/Validator.oxt
-#	ln -s ${srcdir}/ext_sources/*WatchWindow* solver/unxlngx6.pro/bin/WatchWindow.oxt
-
 	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-#	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-#	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-#	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-#	patch -Np1 -i ${srcdir}/oracle-recognition.diff
-#	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	
+	# one late fix to solve make distro-pack-install issue
+	patch -Np1 -i ${srcdir}/gmake_install.diff
+	patch -Np1 -i ${srcdir}/fix_menuicons.diff
+
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -232,27 +175,18 @@ build() {
 	# python2 fix
 	export PYTHON=python2
 
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
 #	autoconf -f
 
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
 	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+	touch autogen.lastrun
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
 		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
+		--disable-fetch-external \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--disable-verbose \
@@ -269,7 +203,6 @@ build() {
 		--enable-mergelibs \
 		--enable-opengl \
 		--enable-odk\
-		--enable-opengl\
 		--disable-ext-lightproof \
 		--disable-ext-mysql-connector \
 		--with-system-mysql \
@@ -310,44 +243,12 @@ build() {
 		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
 		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 		--with-java-target-version=1.5 \
-		$EXTRAOPTS|| return 1
-
-#		--enable-ext-barcode \
-#		--enable-ext-diagram \
-#		--enable-ext-google-docs \
-#		--enable-ext-hunart \
-#		--enable-ext-nlpsolver \
-#		--enable-ext-ct2n \
-#		--enable-ext-numbertext \
-#		--enable-ext-oooblogger \
-#		--enable-ext-pdfimport \
-#		--enable-ext-presenter-console \
-#		--enable-ext-presenter-minimizer \
-#		--enable-ext-report-builder \
-#		--enable-ext-scripting-beanshell \
-#		--enable-ext-scripting-javascript \
-#		--enable-ext-typo \
-#		--enable-ext-validator \
-#		--enable-ext-watch-window \
-#		--enable-ext-wiki-publisher \
-
-#		--disable-mozilla \
-#		--enable-ldap \
-#		--with-openldap\
-	
-#		--with-system-mozilla\
+		$EXTRAOPTS
 
 #--with-install-dirname="${pkgbase}" 
 #		--enable-cairo\
-#		--enable-ext-scripting-python \
 #		--with-system-libtextcat \
 #		--with-external-libtextcat-data \
-#		--with-system-xrender-headers\
-
-
-
-
-
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
 #--with-servlet-api-jar=JARFILE 
@@ -357,10 +258,9 @@ build() {
 
 	touch src.downloaded
 	#./download
-	unset MAKEFLAGS
-	./bootstrap
+#	unset MAKEFLAGS
+#	./bootstrap
 	make
-	
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -375,11 +275,9 @@ package_libreoffice-common() {
 
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" 'librsvg'
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
+          'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite'
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
           #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
@@ -394,7 +292,6 @@ package_libreoffice-common() {
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             #'libldap:          to get profiles via ldap'
              'lucene:           full-text search engine library for Java needed in the help section'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
@@ -420,10 +317,6 @@ package_libreoffice-common() {
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
  
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
  # put configuration files into place
  install -dm755 ${pkgdir}/etc/libreoffice
  install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
@@ -509,7 +402,7 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib' 'gtk3')
+ depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
  optdepends=()
  backup=()
  groups=('libreoffice')
@@ -695,117 +588,6 @@ package_libreoffice-en-US() {
  done
 }
 
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-libreoffice-core-$_LOver-${_LOver}/libreoffice-core-$_LOver/libreoffice-${_LOver}/solver/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
 package_libreoffice-extension-pdfimport() {
 
  pkgdesc="This extension allows you to import and modify PDF documents"
@@ -846,79 +628,3 @@ package_libreoffice-extension-report-builder() {
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
 	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
 }
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/extra/libreoffice/PKGBUILD.next_stable34 b/extra/libreoffice/PKGBUILD.next_stable34
new file mode 100644
index 000000000..5b9dec2ab
--- /dev/null
+++ b/extra/libreoffice/PKGBUILD.next_stable34
@@ -0,0 +1,925 @@
+# $Id: PKGBUILD 145674 2011-12-26 20:12:16Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
+	#'libreoffice-extension-barcode' # 
+	'libreoffice-extension-diagram'
+	'libreoffice-extension-google-docs'
+	'libreoffice-extension-hunart'
+	#'libreoffice-extension-lightproof' # no source integration
+	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
+	'libreoffice-extension-nlpsolver'
+	'libreoffice-extension-ct2n'
+	'libreoffice-extension-numbertext'	
+	'libreoffice-extension-oooblogger'
+	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
+	'libreoffice-extension-presentation-minimizer'
+	'libreoffice-extension-report-builder'
+	'libreoffice-extension-scripting-beanshell'
+	'libreoffice-extension-scripting-javascript'
+	'libreoffice-extension-scripting-python'
+	'libreoffice-extension-typo'
+	'libreoffice-extension-validator'
+	'libreoffice-extension-watch-window'
+	'libreoffice-extension-wiki-publisher')
+_LOver=3.4.5.2
+pkgver=3.4.5rc2 # last expected release candidate (should become final ) - Release 3.4.5 	Week 2 , Jan 9 - Jan 15, 2012 
+pkgrel=1
+arch=('i686' 'x86_64')
+#_LO_tree="3.4"
+_OFFICEUPD="340"
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
+             'mesa' 'gstreamer0.10-base' 'java-environment'
+              #'saxon' - currently broken 
+             # the depends from libreoffice main pkg
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
+	     'ttf-dejavu') # to satisfy regression tests
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src"
+_additional_source_url="http://hg.services.openoffice.org/binaries"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+	buildfix_boost.diff
+	buildfix_ct2n.diff
+	vbahelper.visibility.patch
+	scp2-more-reasonable-file-access-rights.diff
+	#oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
+	#RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
+	gcc462_buildfix.diff)
+noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
+md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
+         'c1e2dabdf4cfcd5957779014a7f9787e'
+         '79c9c7fc208e7f56af09f284f261a7da'
+         'c83a8a374d3d5cc83c6ac3b5ff613e46'
+         'fa64799ebad8cbd2c160ac2f87bd5599'
+         'b24fba57aa4185934e86a0a8db4a3433'
+         '4f98020088ab9b597fc21b617121bd47'
+         '3c3be7c5f923339c90b0d1d6ecad0243'
+         '3a0bb4bb096b7488533ed2ee466a2bc9'
+         'f2b180aa1eff3884b4ca81c048f1e327'
+         'a9af488ef92ad4442eafba874249c529'
+         'db6a67c96a9090bc5e21b64e202a984e'
+         'e00187ae0840e1f6a00fa3290cacf0d1'
+         '20fbf6cffd2b06e90a52105b75a57828'
+         '4af055f590732ec19a2534b2278ac49c'
+         'c84693796d2b1d9c8269425b1fa53aef'
+         'd4926dc27b6884656feec6753f4fdf22'
+         '770678ca19cca0f7985c1c82b2dccf48'
+         '97a1e3de430b124faf35bf334248ad53'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '18f577b374d60b3c760a3a3350407632'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         '185d60944ea767075d27247c3162b3bc'
+         '90401bca927835b6fbae4a707ed187c8'
+         '451ccf439a36a568653b024534669971'
+         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
+         '41c9b65ad60af4b3255bbecdfef11736'
+         'bbdd5639ada63e3130761daaecae1a10'
+         '23bd75552206dfcd8fd4e29137dcac84'
+         'b8cbca7b3363e6ca2d02bc0ba2b63904'
+         'b632bdd25649cc4067bcb410bae23d2b'
+         '9d60b6cfa3ef1926848710bbcd11115b'
+         'dbaafd21de055e582d92d7d32fe9da13'
+         'b7b2d0e04e142f26dd96119c80757d1f'
+         'bc228237108cab7745897a9f466b6d39'
+         'eee273f501ff45dc5f1365e78c6d57c0'
+         '43b145db28e6c0d73578ae6fd35e510d'
+         '37638431e7e40baf2e47966ebb9bc0e9'
+         '10600d04ee81014bc9b5cc04e615d799')
+
+build() {
+
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+	# move all LibO sources into one build directory
+	mkdir ${srcdir}/build && cd ${srcdir}/build
+	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
+	  mv ${srcdir}/$i/* .
+	done
+#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
+#	./bin/unpack-sources ${srcdir}/build
+
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
+
+	cd ${srcdir}/build
+
+	# buildfixes & bugfixes
+	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
+	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
+	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
+	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+	#patch -Np1 -i ${srcdir}/oracle-recognition.diff
+	#patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
+	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
+#	patch -Np1 -i ${srcdir}/gcc462_buildfix.diff
+	
+	# unset C(XX)FLAGS
+	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
+#	unset CFLAGS
+#	unset CXXFLAGS
+
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+	
+	# python2 fix
+	export PYTHON=python2
+
+	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
+
+#	if [ "$CARCH" = "x86_64" ]; then
+#	      EXTRAOPTS="--without-stlport"
+#	 else 
+#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
+#	      # # avoid problems with ixion for now
+#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
+#	fi
+
+	# needed for 0003-distro-install-fix-en-US-only-installation.patch
+	autoconf -f
+
+	# non-SMP test build
+#	export MAKEFLAGS="-j1"
+	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
+		--disable-verbose \
+		--with-lang="" \
+		--enable-cairo\
+		--enable-crashdump \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--disable-gnome-vfs\
+		--disable-kde\
+		--enable-kde4\
+		--enable-ldap \
+		--enable-lockdown\
+		--enable-opengl \
+		--enable-odk\
+		--enable-ext-barcode \
+		--enable-ext-diagram \
+		--enable-ext-google-docs \
+		--enable-ext-hunart \
+		--disable-ext-lightproof \
+		--disable-ext-mysql-connector \
+		--with-system-mysql \
+		--enable-ext-nlpsolver \
+		--enable-ext-ct2n \
+		--enable-ext-numbertext \
+		--enable-ext-oooblogger \
+		--enable-ext-pdfimport \
+		--enable-ext-presenter-console \
+		--enable-ext-presenter-minimizer \
+		--enable-ext-report-builder \
+		--enable-ext-scripting-beanshell \
+		--enable-ext-scripting-javascript \
+		--enable-ext-scripting-python \
+		--enable-ext-typo \
+		--enable-ext-validator \
+		--enable-ext-watch-window \
+		--enable-ext-wiki-publisher \
+		--without-fonts\
+		--without-afms\
+		--without-ppds\
+		--without-system-libwps\
+		--without-system-mdds\
+		--without-myspell-dicts \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--without-system-saxon\
+		--with-system-libtextcat \
+		--with-external-libtextcat-data \
+		--with-openldap\
+		--with-ant-home="/usr/share/java/apache-ant"\
+		--without-system-boost\
+		--with-system-cairo\
+		--with-system-libs\
+		--with-system-mozilla\
+		--with-system-mythes\
+		--with-system-xrender-headers\
+		--with-system-headers\
+		--with-alloc=system\
+		--with-system-lucene\
+		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+		--with-java-target-version=1.5 \
+		$EXTRAOPTS || return 1
+
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+#--with-servlet-api-jar=JARFILE 
+# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
+#		--with-system-saxon\
+#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+
+	touch src.downloaded
+	#./download
+	unset MAKEFLAGS
+	./bootstrap
+	make
+	
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=${pkgbase}.install
+ depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
+          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
+          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
+	  #'java-runtime' 
+          #'saxon'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
+             'libcups:          adds printing support'
+             'gconf:            adds additional gnome support'
+             'nss:              adds support for signed files/macros'
+             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+             'poppler:          for shipped pdfimport extension'
+             'libmythes:        for use in thesaurus'
+             'hsqldb-java:      default database format for OpenOffice.org'
+             'beanshell:        interactive java -- good for prototyping /macros'
+             'vigra:            C++ computer vision library, usable in Basebmp'
+             'libmspack:        library for Microsoft compression formats for use in FontOOo'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'libldap:          to get profiles via ldap'
+             'lucene:           full-text search engine library for Java needed in the help section'
+             'sane:             for scanner access'
+             'unixodbc:         adds ODBC database support'
+             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ backup=(etc/libreoffice/sofficerc
+         etc/libreoffice/bootstraprc
+         etc/libreoffice/psprint.conf)
+ groups=('libreoffice')
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ #	# remove version in menu entry and make it visible
+#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+
+ #fix http://bugs.archlinux.org/task/17656
+ find ${pkgdir} -perm 444 -exec ls -lh {} \;
+ find ${pkgdir} -perm 444 -exec chmod 644 {} \;
+ find ${pkgdir} -perm 555 -exec ls -lh {} \;
+ find ${pkgdir} -perm 555 -exec chmod 755 {} \;
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'dbus-glib')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # fix ArchLinux LibreOffice installation paths	
+ sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
+        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
+        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
+        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
+        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
+        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
+        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-barcode() {
+
+ pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
+	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
+}
+
+package_libreoffice-extension-diagram() {
+
+ pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
+}
+
+package_libreoffice-extension-google-docs() {
+
+ pkgdesc="Google Documents extension for LibreOffice"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
+}
+
+package_libreoffice-extension-hunart() {
+
+ pkgdesc="Hungarian cross-reference toolbar extension"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
+}
+
+#package_libreoffice-extension-lightproof() {
+
+# pkgdesc="Lightproof extension for LibreOffice"
+ #arch=('any')
+# depends=('libreoffice-common')
+# groups=('libreoffice-extensions')
+
+#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
+#}
+
+#package_libreoffice-extension-mysql-connector() {
+
+# pkgdesc="MySQL Connector extension for LibreOffice"
+ #arch=('any')
+# depends=('libreoffice-common')
+# groups=('libreoffice-extensions')
+
+#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
+#}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+}
+
+package_libreoffice-extension-ct2n() {
+
+ pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
+}
+
+package_libreoffice-extension-numbertext() {
+
+ pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
+}
+
+package_libreoffice-extension-oooblogger() {
+
+ pkgdesc="An extensions for blogging"
+ #arch=('any')
+ depends=('libreoffice-common' 'coreutils' 'python')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
+}
+
+package_libreoffice-extension-pdfimport() {
+
+ pkgdesc="This extension allows you to import and modify PDF documents"
+ depends=('libreoffice-common' 'poppler')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+}
+
+package_libreoffice-extension-presenter-screen() {
+
+ pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+}
+
+package_libreoffice-extension-presentation-minimizer() {
+
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice-common' 'gcc-libs')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+}
+
+package_libreoffice-extension-report-builder() {
+
+ pkgdesc="This extension creates smart-looking database reports"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+}
+
+package_libreoffice-extension-scripting-beanshell() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
+}
+
+package_libreoffice-extension-scripting-javascript() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
+}
+
+package_libreoffice-extension-scripting-python() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in Python"
+ depends=('libreoffice-common' 'python')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
+}
+
+package_libreoffice-extension-typo() {
+
+ pkgdesc="Typography toolbar extension"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+	find ${pkgdir} -type d -exec chmod 755 {} \;
+	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+}
+
+package_libreoffice-extension-validator() {
+
+ pkgdesc="Validator extension for LibreOffice"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
+}
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-watch-window() {
+
+ pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
+}
diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install
index 809472f89..cb0d393dd 100644
--- a/extra/libreoffice/libreoffice.install
+++ b/extra/libreoffice/libreoffice.install
@@ -1,6 +1,7 @@
 post_install() {
 
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+#xdg-icon-resource forceupdate --theme hicolor
 update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
 
@@ -25,6 +26,7 @@ echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
 post_upgrade() {
 #  post_install $1
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+#xdg-icon-resource forceupdate --theme hicolor
 update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
   if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
@@ -43,5 +45,6 @@ update-mime-database usr/share/mime > /dev/null 2>&1
 post_remove() {
 update-desktop-database -q
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+#xdg-icon-resource forceupdate --theme hicolor
 update-mime-database usr/share/mime > /dev/null 2>&1
 }
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index de3e672d2..5b2f948c1 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145447 2011-12-22 13:02:48Z giovanni $
+# $Id: PKGBUILD 146502 2012-01-12 07:42:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.12.20
+pkgver=2012.01.07
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('1bcbd2e45149c0d918c63df8f6d7d0e0')
+md5sums=('416375892db282da88fdc7f7a3f2385f')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index ecd33c675..5268abe7b 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144344 2011-12-04 21:37:38Z giovanni $
+# $Id: PKGBUILD 146493 2012-01-11 16:54:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('16576b3089a88a84a35edc30e17a03a9'
+md5sums=('226b45f19bebf73446fcd73ccb678c52'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 9e460b754..b4e0c93ee 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $
+# $Id: PKGBUILD 146475 2012-01-11 15:22:23Z stephane $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=20110528
-pkgrel=4
+pkgrel=5
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD
index 00d32c17e..b60143b19 100644
--- a/extra/mrtg/PKGBUILD
+++ b/extra/mrtg/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143911 2011-11-30 20:31:37Z giovanni $
+# $Id: PKGBUILD 146521 2012-01-12 10:46:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=mrtg
-pkgver=2.17.2
-pkgrel=2
+pkgver=2.17.4
+pkgrel=1
 pkgdesc="Multi Router Traffic Grapher."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.oetiker.ch/mrtg/"
 license=('GPL')
 depends=('gd' 'perl')
 source=("http://oss.oetiker.ch/mrtg/pub/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f4c251ef883da2509188711eff4577ad')
+md5sums=('197565e97f97212eef7b414463c8d40c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 48fd4b14c..b340e8367 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143654 2011-11-28 04:52:17Z eric $
+# $Id: PKGBUILD 146283 2012-01-08 05:55:19Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Ben Mazer <blm@groknil.org>
 
 pkgname=msmtp
-pkgver=1.4.26
+pkgver=1.4.27
 pkgrel=1
 pkgdesc="A mini smtp client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('texlive-core')
 provides=('smtp-forwarder')
 install=msmtp.install
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('0ce5352447b01dc21970b7a00cf13b8a3e7172c9')
+sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 5caa18d63..47703294c 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144910 2011-12-09 17:20:57Z andrea $
+# $Id: PKGBUILD 146513 2012-01-12 08:08:19Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.19
+pkgver=5.5.20
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('a78cf450974e9202bd43674860349b5a'
+md5sums=('375794ebf84b4c7b63f1676bc7416cd0'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index b9a712f86..9c5ec0823 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 131909 2011-07-17 09:27:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146408 2012-01-10 21:28:35Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.42
+pkgver=0.43
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-makedepends=('openobex' 'libical')
+makedepends=('glib2' 'openobex' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('39a85d219dba37d83f5a07a74d1fa563')
+md5sums=('7490dc8536d8ac56afb884c87f24bd08')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index e4f416b5c..f35339262 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145287 2011-12-21 06:58:54Z schiv $
+# $Id: PKGBUILD 146424 2012-01-10 23:37:44Z eric $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.3.1_a
 _realver=2.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
@@ -94,6 +94,10 @@ package_opencv-docs() {
 
   mkdir -p "$pkgdir/usr/share/doc"
   cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -106,6 +110,10 @@ package_opencv-samples() {
 
   mkdir -p "$pkgdir/usr/share/opencv"
   cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
index e1106a77e..0631dc875 100644
--- a/extra/oxine/PKGBUILD
+++ b/extra/oxine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137856 2011-09-12 03:56:43Z eric $
+# $Id: PKGBUILD 146426 2012-01-10 23:37:48Z eric $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=oxine
 pkgver=0.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oxine.sourceforge.net/"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 86b76f2fa..63827e0ed 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145339 2011-12-21 20:47:24Z andrea $
+# $Id: PKGBUILD 146477 2012-01-11 15:22:26Z stephane $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,9 +21,9 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.8
+pkgver=5.3.9
 _suhosinver=5.3.7-0.9.10
-pkgrel=6
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
@@ -36,13 +36,13 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('704cd414a0565d905e1074ffdc1fadfb'
+md5sums=('dd3288ed5c08cd61ac5bf619cb357521'
          '08582e502fed8221c6577042ca45ddb8'
          '5bf4473f658404aa9a97bf026ecef8e9'
-         '65606c606df97a0760dfe5aaf9893afc'
+         'ffc338e8ce2a990f6f2a486355bbab65'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         '09005dabd90c48ddd392b3dbf05f8a82'
+         '740ec5fe2ecfd9d7febd4081c90ec65b'
          '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
@@ -137,7 +137,7 @@ build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+	sed 's/1997-2011/1997-2012/g' ${srcdir}/suhosin-patch-${_suhosinver}.patch | patch -p1
 
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index b4dd32f96..b923edb38 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
+--- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -17,8 +17,8 @@
 +pid = run/php-fpm/php-fpm.pid
  
  ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -102,7 +102,8 @@
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -140,7 +140,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -28,7 +28,7 @@
  
  ; Set listen(2) backlog. A value of '-1' means unlimited.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -121,9 +122,9 @@
+@@ -151,9 +152,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0666
@@ -38,38 +38,10 @@
 +listen.owner = @php_fpm_user@
 +listen.group = @php_fpm_group@
 +listen.mode = 0660
- 
- ; Unix user/group of processes
- ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -163,23 +164,23 @@
- ; The number of child processes created on startup.
- ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
--;pm.start_servers = 20
-+pm.start_servers = 20
- 
- ; The desired minimum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
- 
- ; The desired maximum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
   
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
- ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
- ; Default Value: 0
--;pm.max_requests = 500
-+pm.max_requests = 500
- 
- ; The URI to view the FPM status page. If this value is not set, no URI will be
- ; recognized as a status page. By default, the status page shows the following
-@@ -333,7 +334,7 @@
+ ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+ ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+@@ -442,7 +443,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 46c842921..3dc5b6560 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,5 +1,5 @@
---- php.ini-production	2011-02-09 01:25:44.000000000 +0100
-+++ php.ini-production	2011-03-19 11:11:44.496987763 +0100
+--- php.ini-production	2011-12-15 11:31:02.000000000 +0100
++++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
 @@ -376,7 +376,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -781,7 +781,7 @@
+@@ -793,7 +793,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -804,7 +804,7 @@
+@@ -816,7 +816,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -938,53 +938,49 @@
+@@ -950,53 +950,49 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -52,7 +52,7 @@
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
 -;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+-;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mssql.dll
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 98a4e1def..c5dbb9e31 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142240 2011-11-07 04:19:17Z bisson $
+# $Id: PKGBUILD 146479 2012-01-11 15:22:30Z stephane $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.8.7
-pkgrel=1.1
+pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 94cf43c5c..c510b4659 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $
+# $Id: PKGBUILD 146388 2012-01-10 00:35:24Z eric $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
 pkgver=1.3.4a
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 31062ed07..50653df35 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145002 2011-12-13 23:35:31Z eric $
+# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,18 +6,19 @@
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=python-lxml
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64' 'mips64el')
-license=('BSD' 'GPL' 'custom')
+license=('BSD' 'custom')
 url="http://lxml.de/"
 depends=('python2' 'libxslt')
 optdepends=('python-beautifulsoup: support for parsing not well formed HTML')
 conflicts=('lxml')
 replaces=('lxml')
-source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz")
-md5sums=('50ed3706da4665c40600fd6e2a7d1159')
+source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
+md5sums=('a7825793c69d004f388ec6600bad7a6f'
+         '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
 
 check() {
   cd "${srcdir}"/lxml-$pkgver
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index 9356ec06c..93dfc8109 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $
+# $Id: PKGBUILD 146436 2012-01-11 05:01:01Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=rdesktop
-pkgver=1.7.0
-pkgrel=2
-depends=('libx11' 'openssl' 'libao' 'libsamplerate')
+pkgver=1.7.1
+pkgrel=1
 pkgdesc="An open source client for Windows Remote Desktop Services"
-url="http://www.rdesktop.org/"
-license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.rdesktop.org/"
+license=('GPL3')
+depends=('libx11' 'openssl' 'libao' 'libsamplerate')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
-md5sums=('77fa93b21aa38837a85e81c00e757228'
+md5sums=('c4b39115951c4a6d74f511c99b18fcf9'
          '880d3aeac67b901e6bf44d1323374768'
          'bd2c9bc68bddcc2652c668753d787df7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # FS#15113
-  patch -i ${srcdir}/rdesktop-send_physical_buttons.diff
+  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
 
   # Fix libao segfault, from Fedora
-  patch -i ${srcdir}/rdesktop-libao.patch
+  patch -i "${srcdir}/rdesktop-libao.patch"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD
index 3b3d59ab3..f50eaaf1a 100644
--- a/extra/re-alpine/PKGBUILD
+++ b/extra/re-alpine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125747 2011-05-29 05:24:41Z eric $
+# $Id: PKGBUILD 146303 2012-01-09 01:01:51Z eric $
 # Maintainer:  Eric Bélanger <eric@archlinux.org>
 # Contributor: Smith Dhumbumroong <zodmaner@gmail.com>
 
@@ -26,7 +26,7 @@ sha1sums=('9c2f13dbc7ca75e7a09f81df607db84694b10fa6'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../maildir.patch
-   LIBS+=-lpam ./configure --prefix=/usr --without-passfile --without-tcl \
+   LIBS+="-lpam -lkrb5 -lcrypto" ./configure --prefix=/usr --without-passfile --without-tcl \
     --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
     --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed
   make
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index dda91982a..88da1207e 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145343 2011-12-21 20:47:36Z andrea $
+# $Id: PKGBUILD 146481 2012-01-11 15:22:34Z stephane $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
@@ -6,11 +6,11 @@ pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
 pkgver=1.0.15
-pkgrel=2
+pkgrel=3
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 569199096..8e060de53 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143822 2011-11-29 13:33:50Z stephane $
+# $Id: PKGBUILD 146483 2012-01-11 15:22:37Z stephane $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -7,7 +7,7 @@
 pkgbase=ruby
 pkgname=('ruby' 'ruby-docs')
 pkgver=1.9.3_p0
-pkgrel=2
+pkgrel=3
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ruby-lang.org/en/"
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 3a061100e..f7df1e584 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144954 2011-12-12 00:43:44Z eric $
+# $Id: PKGBUILD 146485 2012-01-11 15:22:42Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
@@ -21,8 +21,13 @@ url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch)
+        svnserve svn svnserve.conf subversion.rpath.fix.patch)
+sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
+          '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
+          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
+          '73b36c046c09cec2093354911c89e3ba8056af6c'
+          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -41,7 +46,7 @@ build() {
    else
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
                --enable-javahl --with-gnome-keyring --with-kwallet
    fi
 
@@ -76,7 +81,6 @@ package() {
    install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
    install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
    install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-   install -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge
 
    # bash completion
    install -Dm 644 tools/client-side/bash_completion \
diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD
index f0342dc9c..62e5bedd6 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 69561 2010-02-21 04:47:38Z allan $
-# Maintainer: eric <eric@archlinux.org>
-# Contributor : Markus Meissner <markus@meissna.de>
+# $Id: PKGBUILD 146404 2012-01-10 21:14:26Z andrea $
+# Maintainer:
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Markus Meissner <markus@meissna.de>
 
 pkgname=tidyhtml
 # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup
 pkgver=1.46
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A tool to tidy down your HTML code to a clean style"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tidy.sourceforge.net/"
 license=('custom')
+depends=('glibc')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/tidyhtml/${pkgname}-${pkgver}.tar.bz2)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('3d970d54be83c5ec985687e9976a2832')
 
 mksource() {
-  mkdir tidyhtml-${pkgver}
-  cd tidyhtml-${pkgver}
+  mkdir ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   cvs -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy login   #hit enter for password
   cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy
   cd ..
-  tar -cvjf tidyhtml-${pkgver}.tar.bz2 tidyhtml-${pkgver}/*
+  tar -cvjf ${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}/*
 }
 
 build(){
@@ -28,9 +30,13 @@ build(){
   source build/gnuauto/setup.sh
   
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd $srcdir/${pkgname}-${pkgver}/tidy
   make DESTDIR=$pkgdir install
   
   install -Dm644 htmldoc/license.html \
-    ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
new file mode 100644
index 000000000..3b0a38400
--- /dev/null
+++ b/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
@@ -0,0 +1,31 @@
+From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@gmail.com>
+Date: Thu, 29 Dec 2011 03:28:27 +0200
+Subject: [PATCH] gtk: conf: set correct download dir default
+
+Otherwise people might get:
+ERROR:open-dialog.c:285:gtr_torrent_options_dialog_new: code should not be reached
+
+It was fixed at some point in ticket #1873, but somebody broket it
+again.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+---
+ gtk/conf.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/conf.c b/gtk/conf.c
+index 623b839..6ad6ca2 100644
+--- a/gtk/conf.c
++++ b/gtk/conf.c
+@@ -108,7 +108,6 @@ tr_prefs_init_defaults( tr_benc * d )
+     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 );
+     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 );
+ 
+-    str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
+     tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str );
+ 
+     tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
+-- 
+1.7.8.1
+
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 76b7e4407..1d9353bd3 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $
+# $Id: PKGBUILD 146293 2012-01-08 17:03:43Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.42
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz
-        transmissiond transmissiond.conf)
+source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
+        transmissiond transmissiond.conf
+        0001-gtk-conf-set-correct-download-dir-default.patch
+        fix_minimize.patch)
 md5sums=('50f6dd76c5c01f45d5ed20783c686815'
          '08875299e3fbb68fc546c1f350ac1f06'
-         'be39806c35b7544856fa4070b00fc960')
+         'be39806c35b7544856fa4070b00fc960'
+         'f9fae46f5aa9ed3a22af64091604c6d0'
+         'bd764dea56aaf69757762ea1a4c92be2')
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
+  patch -Np2 -i "$srcdir/fix_minimize.patch"
 
   ./configure --prefix=/usr
   make
@@ -29,16 +36,16 @@ package_transmission-cli() {
   backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   for dir in daemon cli web utils
   do
-      make -C "${dir}" DESTDIR="${pkgdir}" install
+      make -C "$dir" DESTDIR="$pkgdir" install
   done
 
-  install -D -m755 "${srcdir}/transmissiond" "${pkgdir}/etc/rc.d/transmissiond"
-  install -D -m644 "${srcdir}/transmissiond.conf" "${pkgdir}/etc/conf.d/transmissiond"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/transmission-cli/COPYING"
+  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
+  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
 }
 
 package_transmission-gtk() {
@@ -48,11 +55,11 @@ package_transmission-gtk() {
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
-  make -C gtk DESTDIR="${pkgdir}" install
-  make -C po DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/transmission-gtk/COPYING"
+  make -C gtk DESTDIR="$pkgdir" install
+  make -C po DESTDIR="$pkgdir" install
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
 }
 
 package_transmission-qt() {
@@ -61,11 +68,11 @@ package_transmission-qt() {
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
-  make -C qt INSTALL_ROOT="${pkgdir}"/usr install
+  make -C qt INSTALL_ROOT="$pkgdir"/usr install
 
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/transmission-qt/COPYING"
-  install -D -m644 qt/icons/transmission.png "${pkgdir}/usr/share/pixmaps/transmission-qt.png"
-  install -D -m644 qt/transmission-qt.desktop "${pkgdir}/usr/share/applications/transmission-qt.desktop"
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
+  install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
+  install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
 }
diff --git a/extra/transmission/fix_minimize.patch b/extra/transmission/fix_minimize.patch
new file mode 100644
index 000000000..fe0f42a03
--- /dev/null
+++ b/extra/transmission/fix_minimize.patch
@@ -0,0 +1,27 @@
+Index: /trunk/gtk/main.c
+===================================================================
+--- /trunk/gtk/main.c	(revision 12968)
++++ /trunk/gtk/main.c	(revision 13067)
+@@ -73,4 +73,5 @@
+     gboolean                    is_iconified;
+ 
++    guint                       activation_count;
+     guint                       timer;
+     guint                       update_model_soon_tag;
+@@ -533,6 +534,14 @@
+ 
+ static void
+-on_activate( GApplication * app UNUSED, gpointer unused UNUSED )
+-{
++on_activate( GApplication * app UNUSED, struct cbdata * cbdata )
++{
++    cbdata->activation_count++;
++
++    /* GApplication emits an 'activate' signal when bootstrapping the primary.
++     * Ordinarily we handle that by presenting the main window, but if the user
++     * user started Transmission minimized, ignore that initial signal... */
++    if( cbdata->is_iconified && ( cbdata->activation_count == 1 ) )
++        return;
++
+     gtr_action_activate( "present-main-window" );
+ }
diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD
index acb7b5fc4..db618dd58 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 69147 2010-02-18 00:38:05Z dgriffiths $
-# Maintainer: François Charette <firmicus ατ gmx δοτ net> 
+# $Id: PKGBUILD 146400 2012-01-10 20:33:06Z andrea $
+# Maintainer:
+# Contributor: François Charette <firmicus ατ gmx δοτ net> 
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Michal Hybner <dta081@gmail.com>
+
 pkgname=wavpack
 pkgver=4.60.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.wavpack.com/"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2)
+source=("http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('7bb1528f910e4d0003426c02db856063')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr --enable-mmx --disable-static || return 1
-	make || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --enable-mmx \
+    --disable-static
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
-	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-	rm -f ${pkgdir}/usr/lib/*.a
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 license.txt \
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
index c4612bbda..3badf429f 100644
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ b/extra/windowmaker-crm-git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 137555 2011-09-09 11:26:39Z daniel $
+# $Id: PKGBUILD 146365 2012-01-09 19:01:56Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=windowmaker-crm-git
-pkgver=20110909
+pkgver=20120109
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 provides=('windowmaker')
 conflicts=('windowmaker')
 source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)
-md5sums=('594f66f40130fe49b6350579f4d54c2b'
+md5sums=('abe70f9cc7606c73a9bbe498cacf925a'
          '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
@@ -23,8 +23,14 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
     --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
     --enable-usermenu --enable-modelock --enable-xrandr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd $srcdir/windowmaker-$pkgver
+  
+  make DESTDIR=$pkgdir install
   install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
   install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
+
 }
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index f1e781932..dadeca510 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 71460 2010-03-07 10:56:49Z daniel $
+# $Id: PKGBUILD 146321 2012-01-09 18:41:18Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
-pkgver=0.92.0
-pkgrel=8
+pkgver=0.95.0
+pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64 'mips64el')
-url="http://www.windowmaker.info/"
+url="http://www.windowmaker.org/"
 license=('GPL' 'custom')
-depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
+depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 options=('!libtool')
-source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2 libpng-1.4.patch)
-md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320'\
-         '409173062955f4a527d88cd7a007efa7')
-sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' '764aa4883b289994177fd3735541d050fda5bcdb'\
-         '027e1d06360fa38fe95afab6e73b7e9f144da687')
+source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)  
+md5sums=('2d89834b4019e0a08641709ea7235db2'
+         '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
-  cd $srcdir/WindowMaker-$pkgver
-  patch -p1 < ../libpng-1.4.patch || return 1
-  patch -Np1 -i ../windowmaker-gcc4.patch || return 1
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
+  cd $srcdir/windowmaker-$pkgver
   [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnustepdir=/usr/lib/GNUstep --with-nlsdir=/usr/share/locale \
-    --enable-xinerama  || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
+    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
+    --enable-usermenu --enable-modelock --enable-xrandr
+  make
+}
+
+package() {
+  cd $srcdir/windowmaker-$pkgver
+  
+  make DESTDIR=$pkgdir install
   install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
+  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
 }
 
diff --git a/extra/windowmaker/wmaker.desktop b/extra/windowmaker/wmaker.desktop
new file mode 100644
index 000000000..f819c7577
--- /dev/null
+++ b/extra/windowmaker/wmaker.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=windowmaker
+Exec=/usr/bin/wmaker
+Type=Application
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index b235d204a..265ba60ca 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140320 2011-10-11 21:28:57Z jgc $
+# $Id: PKGBUILD 146316 2012-01-09 16:15:38Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-_gitdate=20110829
+_gitdate=20120106
 pkgver=0.0.16_git${_gitdate} # see configure.ac
 pkgrel=1
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
@@ -15,27 +15,27 @@ optdepends=('nouveau-dri:	experimental gallium3d features')
 makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
 conflicts=('xorg-server<1.11.0')
 options=('!libtool')
-install=${pkgname}.install
+install=$pkgname.install
 source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('8f484f6602a3711f4adfbce74fd886c1')
+md5sums=('4b0ee8643b3322ff3a0c5d70262a54af')
 
 # source PKGBUILD && mksource
 mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
+	mkdir /tmp/$pkgname-${_gitdate}
+	pushd /tmp/$pkgname-${_gitdate}
 	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
 	cd xf86-video-nouveau
-	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
+	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
 	popd
 }
 
 build() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
   ./autogen.sh --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
-  make DESTDIR=${pkgdir} install
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
+  make DESTDIR=$pkgdir install
 }
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 9eab2ca68..73c12fb8d 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $
+# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.1.20
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
-depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
-             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+depends=('libxvmc' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
 optdepends=('imagemagick: for using the imagemagick plugin' \
-            'smbclient: for using the smb plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin' \
-            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
             'mesa: for using the opengl plugin' \
-            'libpulse: for using the pulseaudio plugin' \
-            'speex: for using the speex plugin' \
-            'v4l-utils: for using the v4l plugin' \
             'wavpack: for using the wavpack plugin' \
             'faad2: for using the faad plugin' \
             'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin')
+            'aalib: for using the aalib plugin' \
+            'libmodplug: for using the modplug plugin' \
+            'libdca: for using the dca plugin' \
+            'a52dec: for using the a52 plugin' \
+            'libmad: for using the mp3 plugin' \
+            'libmpcdec: for using the musepack plugin' \
+            'libcaca: for using the caca plugin' \
+            'libbluray: for using the bluray plugin' \
+            'gnome-vfs: for using the gnome-vfs plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc')
+sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
-    configure src/input/input_v4l.c src/video_out/video_out_syncfb.h
-  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \
-    --disable-optimizations
+  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
   make
 }
 
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index 0ff24e168..30a5fe030 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 144037 2011-12-02 17:33:46Z eric $
+# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libxtst'  'libpng' 'libxft' 'libxxf86vm'
+depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
 	 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
 	 'desktop-file-utils' 'lirc-utils')
 makedepends=('libxt')
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-13 14:21:34 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-13 14:21:34 -0300
commit	4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch)
tree	69e20048be17aa12e6342ebcafb0cf9cdbfee32d /extra
parent	149750d28420a7b59fab5501ab9aaca095f6fa46 (diff)
parent	b5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff)