Thu Jan 12 23:14:51 UTC 2012

65 files changed, 1729 insertions, 576 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index f0f41709f..ff8e20911 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.14.0
+pkgver=1.14.1
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://aria2.sourceforge.net/'
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
 source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2")
-md5sums=('577b3b5f19c28de4451cd1a32de76eeb')
+md5sums=('3a23844ab3e1460eb7e6dac9b5dd798c')
 
 build() {
   cd aria2-${pkgver}
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 4fdea4990..618c18f3b 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.3.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -14,7 +14,7 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.conf'
         'bird.service'
         'bird6.service')
-md5sums=('20f5aa9d3f853d2c922438dc9d922ecc'
+md5sums=('9efc2b1c05fa6298a8df60f5147ad5c1'
          '1a4b98756d64f52333a83eff2e95d233'
          '25241a4d7ef639506e0080431b2c1690'
          'e82a0519dca0b289685fda44787f5911'
diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index f7428aa09..8dea9cf86 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49679 2011-06-19 07:23:27Z andrea $
+# $Id: PKGBUILD 61947 2012-01-11 15:21:36Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ViNS <gladiator@fastwebnet.it>
 
 pkgname=dsniff
 pkgver=2.4b1
-pkgrel=20
+pkgrel=21
 pkgdesc="Collection of tools for network auditing and penetration testing"
 url="http://www.monkey.org/~dugsong/dsniff/"
 arch=('i686' 'x86_64')
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 37ae39bdc..aefe386cd 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56931 2011-10-17 02:10:43Z angvp $
+# $Id: PKGBUILD 61949 2012-01-11 15:21:55Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
 pkgver=4.77
-pkgrel=1
-pkgdesc="A Message Transfer Agent"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="Message Transfer Agent"
+arch=('x86_64' 'i686')
 url="http://www.exim.org/"
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf \
@@ -16,33 +16,33 @@ depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server')
 conflicts=('smtp-server')
 options=('!makeflags')
-source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2
+source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2"
         aliases
         exim
         exim.logrotate
         exim.conf.d
         exim.Makefile)
-md5sums=('5d746275f2cc85845567f9d5eb84a57a'
-         '4874006f0585253ddab027d441009757'
-         '9aed772e87223213e8da9ca5e7376869'
-         'e18a535218718c5eb394ed5c9296fe06'
-         'b75fe4c6e960a59a25b5f51e8f61ba3a'
-         '5c2891dc3535c346982fa358fbba6d31')
+sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
+            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
+            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
+            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
+            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
+            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
-  # Make some configuration changes
+
   cp "$srcdir/$pkgname.Makefile" Local/Makefile
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -D -m644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
-  install -D -m644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
-  install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
-  install -D -m755 ../exim ${pkgdir}/etc/rc.d/exim
+
+  install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
+  install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
+  install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
+  install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim
   mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
     ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
   chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
@@ -69,3 +69,5 @@ package() {
   mkdir -p "$pkgdir/etc/rc.d"
   cp "$srcdir/exim" "$pkgdir/etc/rc.d"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile
index 0a6397318..a304ce829 100644
--- a/community/exim/exim.Makefile
+++ b/community/exim/exim.Makefile
@@ -1222,6 +1222,6 @@ PID_FILE_PATH=/var/run/exim.pid
 # ENABLE_DISABLE_FSYNC=yes
 
 HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap
+LOOKUP_LIBS=-lldap -llber
 EXTRALIBS_EXIM=-lpam
 # End of EDITME for Exim 4.
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 9dc24f933..d2bd49b05 100755
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61936 2012-01-11 09:30:32Z ttopper $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
-# Contributor: Thomas Bächler
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+# Contributor: Thomas Bächler
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=fcron
 pkgver=3.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="feature-rich cron implementation"
 arch=(i686 x86_64)
 url="http://fcron.free.fr"
 license=('GPL')
-depends=('sh')
+depends=('pam')
 makedepends=('smtp-server')
 optdepends=('smtp-server: to receive mails from cron jobs')
 provides=('cron')
 conflicts=('dcron')
 backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
         var/spool/fcron/systab var/spool/fcron/systab.orig)
-install=fcron.install
 options=('emptydirs' '!makeflags')
 source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
         systab systab.orig run-cron)
@@ -34,8 +33,8 @@ build() {
               --sysconfdir=/etc/fcron \
               --with-answer-all=no \
               --with-boot-install=no \
-              --with-username=cron \
-              --with-groupname=cron \
+              --with-username=root \
+              --with-groupname=root \
               --datarootdir=/usr/share \
 	            --datadir=/usr/share \
               --with-docdir=/usr/share/doc \
@@ -46,26 +45,26 @@ build() {
 }
 
 package() {
-  # Create necessary user and group
-  getent group cron || /usr/sbin/groupadd -g 22 cron
-  getent passwd cron || /usr/sbin/useradd -d / -g cron -u 22 -s /bin/false cron
-
   cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir/var/spool"
+  
   make DESTDIR="$pkgdir/" install
   install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
+  
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
   # Install default fcrontab so that fcron can completely replace dcron
+  
   install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
   # In order to preserve the systab crontab in any case it is better to have
   # it in non-binary form too
   install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
+
   # Add cron.* directories
   install -d -m755 "$pkgdir/etc/cron.daily"
   install -d -m755 "$pkgdir/etc/cron.hourly"
   install -d -m755 "$pkgdir/etc/cron.monthly"
   install -d -m755 "$pkgdir/etc/cron.weekly"
+  
   # Install run-cron script to make fcron run without dcron
   install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
 }
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 25e029361..6c5822693 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 60185 2011-12-06 20:06:27Z stativ $
+# $Id: PKGBUILD 61941 2012-01-11 11:33:35Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=11
-_pkgver=111.69
+pkgver=11.0.1
+_pkgver=111.167
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('d838994ecc6556b52a83d37138530dbb')
+md5sums=('8bbc18afd0e72a45fc9302001474e1ce')
 
 build() {
   cd "$srcdir"
diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD
index 6118698ad..aa94f5f82 100644
--- a/community/libgda3/PKGBUILD
+++ b/community/libgda3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61111 2011-12-21 20:57:25Z andrea $
+# $Id: PKGBUILD 61951 2012-01-11 15:22:01Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgda3
 pkgver=3.1.5
-pkgrel=10
+pkgrel=11
 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
 arch=('i686' 'x86_64')
 url="http://www.gnome-db.org/Download"
@@ -20,6 +20,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
+
 package(){
   cd "$srcdir/libgda-$pkgver"
   make DESTDIR=$pkgdir install
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index c4eff2270..c5e3ffb0a 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58641 2011-11-16 23:02:02Z andrea $
+# $Id: PKGBUILD 61953 2012-01-11 15:22:10Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcc
 pkgver=0.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Charset Conversion Library"
 arch=(i686 x86_64)
 url="http://rusxmms.sourceforge.net/"
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 4864ffd72..2a42c84d2 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58989 2011-11-20 19:39:08Z spupykin $
+# $Id: PKGBUILD 61963 2012-01-11 15:42:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 # Contributor: Chuck Yang <Chuck.Yang@gmail.com>
 
 pkgname=lshw
-pkgver=B.02.15
+pkgver=B.02.16
 pkgrel=1
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
@@ -14,13 +14,16 @@ depends=('gcc-libs')
 optdepends=('gtk2')
 makedepends=('gcc' 'gtk2' 'sqlite3')
 source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz)
-md5sums=('970bd9eb05fa3ae139a24a417465c54c')
+md5sums=('67479167add605e8f001097c30e96d0d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   make
   make gui
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
   make DESTDIR=$pkgdir/ install-gui
 }
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 108b4ebc3..20c5f045c 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60080 2011-12-04 22:03:31Z giovanni $
+# $Id: PKGBUILD 61967 2012-01-11 17:03:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -35,7 +35,7 @@ package() {
 
   make DESTDIR=${pkgdir} install
 
-  install -D ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
   install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd
   install -d ${pkgdir}/usr/lib/pcsc/drivers
 }
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
new file mode 100644
index 000000000..4a03ded15
--- /dev/null
+++ b/community/percona-server/PKGBUILD
@@ -0,0 +1,103 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=percona-server
+pkgver=5.5.18_rel23.0
+pkgrel=1
+pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
+arch=('i686' 'x86_64')
+
+depends=('mysql-clients' 'libaio')
+conflicts=('mysql')
+provides=('mysql')
+optdepends=('perl-dbi' 'perl-dbd-mysql')
+makedepends=('cmake' 'openssl' 'zlib')
+
+license=('GPL')
+url="http://www.percona.com/software/percona-server/"
+options=('!libtool' 'emptydirs')
+backup=('etc/mysql/my.cnf')
+install=percona.install
+source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/Percona-Server-${pkgver/_/-}.tar.gz"
+        'mysqld'
+        'my.cnf')
+
+build() {
+	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
+	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
+
+	cd "${srcdir}"
+	rm -rf build
+	mkdir build
+	cd build
+
+	# CFLAGS/CXXFLAGS as suggested upstream
+	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+
+	cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \
+		-DMANUFACTURER=Arch \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DDEFAULT_CHARSET=utf8 \
+		-DDEFAULT_COLLATION=utf8_general_ci \
+		-DENABLED_LOCAL_INFILE=ON \
+		-DINSTALL_INFODIR=share/mysql/docs \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+		-DINSTALL_SCRIPTDIR=bin \
+		-DINSTALL_INCLUDEDIR=include/mysql \
+		-DINSTALL_DOCREADMEDIR=share/mysql \
+		-DINSTALL_SUPPORTFILESDIR=share/mysql \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_DOCDIR=share/mysql/docs \
+		-DINSTALL_SHAREDIR=share/mysql \
+		-DWITH_READLINE=OFF \
+		-DWITH_ZLIB=system \
+		-DWITH_SSL=system \
+		-DWITH_LIBWRAP=OFF \
+		-DWITH_LIBEDIT=OFF \
+		-DWITH_UNIT_TESTS=OFF \
+		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+		-DWITH_EXTRA_CHARSETS=complex \
+		-DWITH_EMBEDDED_SERVER=ON \
+		-DWITH_INNOBASE_STORAGE_ENGINE=ON \
+		-DWITH_PARTITION_STORAGE_ENGINE=ON \
+		-DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \
+		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+		-DWITH_FEDERATED_STORAGE_ENGINE=OFF \
+		-DWITH_EXAMPLE_STORAGE_ENGINE=OFF
+
+	make
+}
+
+package() {
+	cd "${srcdir}"/build
+	make DESTDIR=${pkgdir} install
+
+	install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+	install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
+
+	# provided by libmysqlclient
+	rm ${pkgdir}/usr/bin/mysql_config
+	rm ${pkgdir}/usr/lib/libmysql*
+	rm -r ${pkgdir}/usr/include/
+	rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+	# provided by mysql-clients
+	rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+	rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+	# not needed
+	rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
+	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
+
+	install -dm700 "${pkgdir}"/var/lib/mysql
+}
+
+md5sums=('17b266f5c10d01838522188f313a1ead'
+         '243864805611764a7e5883c1dba7afd8'
+         '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community/percona-server/my.cnf b/community/percona-server/my.cnf
new file mode 100644
index 000000000..9a41b4fc3
--- /dev/null
+++ b/community/percona-server/my.cnf
@@ -0,0 +1,145 @@
+# MySQL config file for medium systems.
+#
+# This is for a system with little memory (32M - 64M) where MySQL plays
+# an important part, or systems up to 128M where MySQL is used together with
+# other programs (such as a web server)
+#
+# MySQL programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, see:
+# http://dev.mysql.com/doc/mysql/en/option-files.html
+#
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
+
+# The following options will be passed to all MySQL clients
+[client]
+#password	= your_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+# Here follows entries for some specific programs
+
+# The MySQL server
+[mysqld]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+datadir		= /var/lib/mysql
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+table_open_cache = 64
+sort_buffer_size = 512K
+net_buffer_length = 8K
+read_buffer_size = 256K
+read_rnd_buffer_size = 512K
+myisam_sort_buffer_size = 8M
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "enable-named-pipe" option) will render mysqld useless!
+# 
+skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
+log-bin=mysql-bin
+
+# binary logging format - mixed recommended
+binlog_format=mixed
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+server-id	= 1
+
+# Replication Slave (comment out master section to use this)
+#
+# To configure this host as a replication slave, you can choose between
+# two methods :
+#
+# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
+#    the syntax is:
+#
+#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
+#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
+#
+#    where you replace <host>, <user>, <password> by quoted strings and
+#    <port> by the master's port number (3306 by default).
+#
+#    Example:
+#
+#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
+#    MASTER_USER='joe', MASTER_PASSWORD='secret';
+#
+# OR
+#
+# 2) Set the variables below. However, in case you choose this method, then
+#    start replication for the first time (even unsuccessfully, for example
+#    if you mistyped the password in master-password and the slave fails to
+#    connect), the slave will create a master.info file, and any later
+#    change in this file to the variables' values below will be ignored and
+#    overridden by the content of the master.info file, unless you shutdown
+#    the slave server, delete master.info and restart the slaver server.
+#    For that reason, you may want to leave the lines below untouched
+#    (commented) and instead use CHANGE MASTER TO (see above)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin=mysql-bin
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /var/lib/mysql
+#innodb_data_file_path = ibdata1:10M:autoextend
+#innodb_log_group_home_dir = /var/lib/mysql
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+#innodb_log_file_size = 5M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff --git a/community/percona-server/mysqld b/community/percona-server/mysqld
new file mode 100644
index 000000000..07f6b7e4c
--- /dev/null
+++ b/community/percona-server/mysqld
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+getPID() {
+   echo $(pgrep -u mysql mysqld 2>/dev/null);
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting Percona Server"
+    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
+    if [ -z "$(getPID)" ]; then
+       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        timeo=30
+        while [ $timeo -gt 0 ]; do
+          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+          echo "$response" | grep -q "mysqld is alive" && break
+          sleep 1
+          let timeo=${timeo}-1
+        done
+        if [ $timeo -eq 0 ]; then
+          stat_fail
+          exit 1
+        else
+          echo $(getPID) > /var/run/mysqld/mysqld.pid
+          add_daemon mysqld
+          stat_done
+        fi
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping Percona Server"
+    if [ ! -z "$(getPID)" ]; then
+      timeo=30
+      kill $(getPID) &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      fi
+      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
+        sleep 1
+        let timeo=${timeo}-1
+      done
+      if [ -z "$(getPID)" ]; then
+        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
+        rm_daemon mysqld
+        stat_done
+      else
+        stat_fail
+        exit 1
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/percona-server/percona.install b/community/percona-server/percona.install
new file mode 100644
index 000000000..caacccf1b
--- /dev/null
+++ b/community/percona-server/percona.install
@@ -0,0 +1,26 @@
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+  /usr/bin/mysql_install_db --user=mysql --basedir=/usr
+  chown -R mysql:mysql var/lib/mysql &>/dev/null
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
+    echo " >> "
+    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
+    echo " >> "
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index eba15cdcc..654211678 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61330 2011-12-28 15:12:23Z spupykin $
+# $Id: PKGBUILD 61955 2012-01-11 15:22:14Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
 pkgver=0.50
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/BerkeleyDB/"
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 4eabbd20e..6d7585008 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57586 2011-10-31 07:11:36Z cbrannon $
+# $Id: PKGBUILD 61945 2012-01-11 11:46:30Z cbrannon $
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 pkgname=plan9port
-pkgver=20111026
+pkgver=20120106
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64')
@@ -48,5 +48,5 @@ build()
     rm -f $i
   done
 }
-md5sums=('4aa76e73fcb9f716165dd628d052cd58'
+md5sums=('7e9ebe75c07a02b1710ee80ce0c4ac65'
          '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index 8c606f322..f8b2e2c39 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49387 2011-06-15 09:36:08Z spupykin $
+# $Id: PKGBUILD 61957 2012-01-11 15:22:20Z stephane $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=poedit
 pkgver=1.4.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64')
 url="http://www.poedit.net/"
diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD
index a3f29df6f..79210ea23 100644
--- a/community/python-bsddb/PKGBUILD
+++ b/community/python-bsddb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55994 2011-09-28 12:21:07Z stephane $
+# $Id: PKGBUILD 61959 2012-01-11 15:22:37Z stephane $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
@@ -7,20 +7,26 @@
 pkgbase=python-bsddb
 pkgname=('python2-bsddb' 'python-bsddb')
 pkgver=5.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python interface for BerkeleyDB"
 license=('MIT')
 arch=('i686' 'x86_64')
 url="http://www.jcea.es/programacion/pybsddb.htm"
 makedepends=('python2-distribute' 'python-distribute')
 source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
+        db_5.3.patch
         LICENSE)
 sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8'
+          '150bb6ce1758ca29f55e876ac75dbac76c9d743d'
           'ef4e4caf618781104dbf5824279ed39d127b4713')
 
 build () {
   cd "${srcdir}"
   
+  pushd bsddb3-${pkgver}
+  patch -Np1 -i ../db_5.3.patch
+  popd
+
   cp -r bsddb3-${pkgver}{,-python2}
 
   # Build python 3 module
diff --git a/community/python-bsddb/db_5.3.patch b/community/python-bsddb/db_5.3.patch
new file mode 100644
index 000000000..6ea4d18bb
--- /dev/null
+++ b/community/python-bsddb/db_5.3.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Jesus Cea <jcea@jcea.es>
+# Date 1324876054 -3600
+# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12
+# Parent  670b1ec4472908a9dc745a338a9f595f92aba667
+Support Berkeley DB 5.3.x
+
+diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py
+--- a/setup2.py	Mon Dec 26 06:04:34 2011 +0100
++++ b/setup2.py	Mon Dec 26 06:07:34 2011 +0100
+@@ -128,7 +128,7 @@
+     incdir = libdir = None
+     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
+         # Supported Berkeley DB versions, in order of preference.
+-        db_ver_list = ((5, 2), (5, 1), (5, 0),
++        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
+                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2))
+ 
+         # construct a list of paths to look for the header file in on
+
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index c89137f73..2bcc42643 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 61972 2012-01-12 00:12:43Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=scrotwm
-pkgver=0.9.34
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64')
 url="http://www.scrotwm.org"
@@ -15,7 +16,7 @@ backup=(etc/scrotwm.conf)
 source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('d38e296dd0bf014046e82cd42932f398'
+md5sums=('407862684229a2c3282f2c1be59ee0fa'
          'a67cfe51079481e5b0eab1ad371379e3'
          '6132ba773ee00f39d8f67ac0347a9814')
 
@@ -39,7 +40,6 @@ package() {
   cd ..
   install -Dm644 scrotwm.conf "$pkgdir/etc/scrotwm.conf"
   install -Dm755 screenshot.sh "$pkgdir/usr/share/scrotwm/screenshot.sh"
-  #cd ../..
   cd "$srcdir"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm755 baraction.sh "$pkgdir/usr/share/scrotwm/baraction.sh"
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 607d5081c..d29b5b9ae 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -5,30 +5,31 @@
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
 pkgname=texmaker
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc='Free cross-platform latex editor'
 arch=('i686' 'x86_64')
 url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
+install='texmaker.install'
 depends=('poppler-qt' 'ghostscript' 'qtwebkit')
 source=("http://www.xm1math.net/texmaker/texmaker-${pkgver}.tar.bz2")
-md5sums=('3d54fe9e5530f5cd8f9365bf9fb2e910')
+md5sums=('aa04c37a0117a6f924c0f7eed5732fe2')
 
 build() {
-	cd texmaker-${pkgver}
+  cd texmaker-${pkgver}
 
-	export INSTALL_ROOT=${pkgdir}
+  export INSTALL_ROOT=${pkgdir}
 
-	qmake -unix PREFIX=//usr texmaker.pro
+  qmake -unix PREFIX=//usr texmaker.pro
 
-	make
+  make
 }
 
 package() {
-	cd texmaker-${pkgver}
+  cd texmaker-${pkgver}
 
-	export INSTALL_PATH=${pkgdir}
+  export INSTALL_PATH=${pkgdir}
 
-	make install
+  make install
 }
diff --git a/community/texmaker/texmaker.install b/community/texmaker/texmaker.install
new file mode 100644
index 000000000..9591f6c5d
--- /dev/null
+++ b/community/texmaker/texmaker.install
@@ -0,0 +1,7 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 65f2b441d..4b9728fc0 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59720 2011-11-29 13:35:44Z stephane $
+# $Id: PKGBUILD 61961 2012-01-11 15:22:47Z stephane $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor : Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=xemacs
 pkgver=21.5.31
-pkgrel=3
+pkgrel=4
 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
 arch=('i686' 'x86_64')
 url="http://www.xemacs.org/"
@@ -14,7 +14,7 @@ optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
             'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
 makedepends=('xbitmaps')
 install=xemacs.install
-source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz
+source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz
         xemacs.desktop
         xemacs-21.5.29-optimization-bug.patch)
 md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 9387174b8..c86b2f44a 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142177 2011-11-05 16:31:54Z stephane $
+# $Id: PKGBUILD 146445 2012-01-11 15:20:54Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
-pkgver=5.2.36
-pkgrel=2
+pkgver=5.3.15
+pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'sh')
 options=('!libtool')
 install=db.install
 source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f')
+sha1sums=('7683b632a01ff3543c379a120809a942ec457738')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
@@ -26,7 +26,7 @@ build() {
 package() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/docs
+  rm -r "${pkgdir}"/usr/docs
   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 642eb2329..cbf7e9c4b 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 142382 2011-11-08 22:05:14Z ronald $
+# $Id: PKGBUILD 146447 2012-01-11 15:20:57Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.39
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('perl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -18,17 +18,17 @@ replaces=('iproute')
 options=('!makeflags')
 backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz
-	'iproute2-fhs.patch')
-sha1sums=('9044ad0b4a34a377a54197724373330294d743c7'
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+	iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
           '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 
 build() {
-  cd $srcdir/iproute2-${pkgver}
-  
+  cd $srcdir/$pkgname-$pkgver
+
   # set correct fhs structure
-  patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
   ./configure
 
@@ -36,16 +36,16 @@ build() {
 }
 
 package() {
-  cd $srcdir/iproute2-${pkgver}
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p ${pkgdir}/sbin
-  mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
-  ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
 
   # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
-  install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
 }
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index c4f93c384..e668cda48 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140271 2011-10-11 21:27:38Z jgc $
+# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-# This package spans multiple repositories. 
+# This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=8
+pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
-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')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index c8842793d..8351587b4 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145244 2011-12-19 22:50:32Z eric $
+# $Id: PKGBUILD 146451 2012-01-11 15:21:08Z stephane $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
 license=('custom')
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 2ac87cd2c..c0f4b4841 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141297 2011-10-28 10:57:26Z tpowa $
+# $Id: PKGBUILD 146453 2012-01-11 15:21:11Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 07a8464b3..de6e057b6 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145797 2012-01-01 18:30:05Z dreisner $
+# $Id: PKGBUILD 146455 2012-01-11 15:21:16Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -19,7 +19,7 @@ perlbin.csh
 provides.pl
 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
 install=perl.install
-options=('!makeflags' '!purge')
+options=('makeflags' '!purge')
 md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
@@ -57,7 +57,8 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make test
+  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
+#  make test
 }
 
 package() {
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 14482efbd..3eba571f9 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')
@@ -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 873d25cc2..9d906429e 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')
 url="http://apr.apache.org/"
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
index 860895cf9..018f70a54 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')
 license=('GPL3')
diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD
index cef8d0dbf..e5a77934b 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')
 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 6d6fd0683..18a75f5a5 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')
 license=('GPL3')
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index a845823a0..e39566a4c 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
+pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
-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')
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index 9cb5ec326..1d7ffb350 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')
 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 2d86f2cc1..80b1ed2aa 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146371 2012-01-09 21:02:00Z 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.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64')
 depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 77ed686dd..b0a9f8837 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')
@@ -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 ff129c990..852e8feb9 100644
--- a/extra/evolution-groupwise/PKGBUILD
+++ b/extra/evolution-groupwise/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146378 2012-01-09 22:04:09Z 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.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GroupWise connector for evolution"
 arch=(i686 x86_64)
 url="http://projects.gnome.org/evolution/"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 24489add5..c8c5e77c8 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146396 2012-01-10 13:06:16Z 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=20120110
+pkgver=20120111
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -13,12 +13,16 @@ license=('GPL')
 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')
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('a8121ae2fbe83044ac27501e3f58780d')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz
+        revert-enabling-threads.patch)
+md5sums=('7a54b2b1af86a746696d1c0b2a79979c'
+         '79cc22bc2ac3e67d96c340cb7061e64d')
 
 build() {
   cd "$srcdir/$pkgname"
 
+  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/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 98c59dfc5..a0026b927 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')
 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/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 107264bc4..eccaf4151 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')
 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 5492bd393..125c5eb13 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')
 #_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 4c7532cfb..c44222970 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')
@@ -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 e886963b4..35bf8e8ed 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')
@@ -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 24465bb6e..8215d4d59 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')
 url="http://moc.daper.net/"
diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD
index 97c9a6007..50899f59b 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')
 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/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 798c9b3f2..bf58c75b4 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')
 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/php/PKGBUILD b/extra/php/PKGBUILD
index f8f817316..7fe8d6ab4 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')
 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 595d82b13..ab2ffd7bc 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
+pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 24a1c2dac..ab30abd27 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')
-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/redland/PKGBUILD b/extra/redland/PKGBUILD
index 33ceed668..2b6db16bd 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')
-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 760386762..c4786c331 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')
 url="http://www.ruby-lang.org/en/"
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 31964707c..11a474e99 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')
 license=('APACHE')
@@ -18,14 +18,12 @@ 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'
-          'd240228e5755495c26e89d7ef47a75fb097dd040'
           '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
@@ -37,7 +35,7 @@ build() {
 
    ./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
 
    make external-all
@@ -71,7 +69,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/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD
index 28f67154f..98b8acd28 100644
--- a/kde-unstable/calligra/PKGBUILD
+++ b/kde-unstable/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145246 2011-12-20 07:55:02Z andrea $
+# $Id: PKGBUILD 146515 2012-01-12 08:10:29Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -23,7 +23,7 @@ pkgname=('calligra-filters'
          'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.3.85
+pkgver=2.3.86
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
@@ -33,7 +33,7 @@ makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf'
              'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
 groups=('calligra')
 source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('a00dbd648ea2c2b56ac62025c836c806')
+md5sums=('1c2d073846089a812cb9ebd43c4b6b56')
 
 build() {
   cd "${srcdir}"
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
new file mode 100644
index 000000000..da1a936ae
--- /dev/null
+++ b/testing/systemd/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 146498 2012-01-12 03:32:19Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=systemd
+pkgver=38
+pkgrel=1
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
+makedepends=('acl' 'gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+            'dbus-python: systemd-analyze'
+            'initscripts: legacy support for hostname and vconsole setup'
+            'initscripts-systemd: native boot and initialization scripts'
+            'python2-cairo: systemd-analyze'
+            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+groups=('systemd')
+options=('!libtool')
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+        etc/dbus-1/system.d/org.freedesktop.login1.conf
+        etc/dbus-1/system.d/org.freedesktop.locale1.conf
+        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+        etc/systemd/system.conf
+        etc/systemd/user.conf
+        etc/systemd/systemd-logind.conf)
+install=systemd.install
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release")
+md5sums=('68c66dce5a28c0efd7c210af5d11efed'
+         '752636def0db3c03f121f8b4f44a63cd')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # Don't unset locale in getty
+  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+  sed -i -e '/^Environ.*LANG/s/^/#/' \
+         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
+              --localstatedir=/var \
+              --with-rootprefix= \
+              --with-rootlibdir=/lib
+
+  make
+
+  # fix .so links in manpages
+  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
+  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # fix systemd-analyze for python2
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # rename man pages to avoid conflicts with sysvinit and initscripts
+  cd "$pkgdir/usr/share/man"
+
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
+  done
+}
+
+# vim: ft=sh syn=sh et
diff --git a/testing/systemd/os-release b/testing/systemd/os-release
new file mode 100644
index 000000000..5e24a6031
--- /dev/null
+++ b/testing/systemd/os-release
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
new file mode 100644
index 000000000..04b29688a
--- /dev/null
+++ b/testing/systemd/systemd.install
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    bin/systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    bin/systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    bin/systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
+
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      bin/systemctl try-restart systemd-logind.service
+    fi
+  fi
+}
+
+post_remove() {
+  if usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et: