Sun Jun 5 22:48:57 UTC 2011

19 files changed, 674 insertions, 450 deletions

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 64ab5d109..2ddf74e03 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $
+# $Id: PKGBUILD 126330 2011-06-04 22:35:21Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -25,7 +25,7 @@ md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
+  patch -Np1 -i ${srcdir}/cups-avahi.patch
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts
@@ -37,7 +37,7 @@ build() {
      --disable-ldap --libdir=/usr/lib --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
      --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
-  make || return 1
+  make
 }
 
 package_libcups() {
@@ -45,7 +45,7 @@ pkgdesc="The CUPS Printing System - client libraries and headers"
 depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs || return 1
+  make BUILDROOT=${pkgdir} install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin
   install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
@@ -67,10 +67,14 @@ backup=(etc/cups/cupsd.conf
         etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
 depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module')
+optdepends=('php: for included phpcups.so module'
+            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
+	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec || return 1
+  make BUILDROOT=${pkgdir} install-data install-exec
 
   # this one we ship in the libcups pkg
   rm -f ${pkgdir}/usr/bin/cups-config
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 796d84761..511538481 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124586 2011-05-23 05:55:07Z eric $
+# $Id: PKGBUILD 126284 2011-06-04 05:34:18Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fetchmail
 pkgver=6.3.19
-pkgrel=2
+pkgrel=3
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
 url="http://fetchmail.berlios.de/"
@@ -34,4 +34,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
   install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
+  install -d "${pkgdir}/var/lib/fetchmail"
 }
diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install
index 711cbe568..0b1cc6ae3 100644
--- a/extra/fetchmail/fetchmail.install
+++ b/extra/fetchmail/fetchmail.install
@@ -3,15 +3,15 @@ post_install() {
   echo "If you run fetchmail as a daemon and not a cron job"
   echo "then 'chown fetchmail /etc/fetchmailrc'"
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/run/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
 }
 
 post_upgrade() {
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/run/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
 
-  if [ "$(vercmp $2 6.3.19)" -lt 0 ] ; then
-    chsh -s /bin/false fetchmail
+  if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
+    usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
   fi
 }
 
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index e731c944b..c84277844 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $
+# $Id: PKGBUILD 126303 2011-06-04 12:33:16Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
 arch=(i686 x86_64)
 url="http://www.gnome.org/projects/gnome-power-manager/"
@@ -14,11 +14,14 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
 options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        fix-suspend.patch)
+sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b'
+            '898454c9a22ecdf56e555687d4d41a0dfa3d590408dc2a17ef6cf4eaec83b262')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-suspend.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-power-manager \
diff --git a/extra/gnome-power-manager/fix-suspend.patch b/extra/gnome-power-manager/fix-suspend.patch
new file mode 100644
index 000000000..acd9093cd
--- /dev/null
+++ b/extra/gnome-power-manager/fix-suspend.patch
@@ -0,0 +1,31 @@
+From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 02 May 2011 23:18:58 +0000
+Subject: gpm-idle: manually update the status property
+
+gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
+therefore we need to manually update the cached property when
+receiving a SessionChanged signal.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=679083
+
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/gpm-idle.c b/src/gpm-idle.c
+index 04225fc..0f2f1ee 100644
+--- a/src/gpm-idle.c
++++ b/src/gpm-idle.c
+@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
+ 		return;
+ 	}
+ 	if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
++                guint status;
++
++                g_variant_get (parameters, "(u)", &status);
++                g_dbus_proxy_set_cached_property (proxy, "status",
++                                                  g_variant_new ("u", status));
+ 		g_debug ("Received gnome session status change");
+ 		gpm_idle_evaluate (idle);
+ 		return;
+--
+cgit v0.9
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 77152f082..e8483fba1 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 80128 2010-05-12 16:41:47Z andrea $
+# $Id: PKGBUILD 126352 2011-06-05 00:53:01Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
-pkgver=0.1.7
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('LGPL')
 depends=('glibc')
 options=('!libtool')
 replaces=('libdvbpsi4' 'libdvbpsi5')
 conflicts=('libdvbpsi4' 'libdvbpsi5')
 url="http://developers.videolan.org/libdvbpsi/"
-source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('af419575719e356b908b0c6946499052')
+source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('b80f3fb7fd58d35276cc4c4a84b6ac03')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install || return 1
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD
index 6471753aa..472c52610 100644
--- a/extra/libpano13/PKGBUILD
+++ b/extra/libpano13/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 96763 2010-10-24 16:48:37Z ibiru $
+# $Id: PKGBUILD 126350 2011-06-05 00:52:37Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libpano13
-pkgver=2.9.17
+pkgver=2.9.18
 pkgrel=1
-pkgdesc="basic library to calculate panoramical pictures - core functions of the panotools"
-url="http://panotools.sourceforge.net/"
+pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools"
 arch=('i686' 'x86_64')
+url="http://panotools.sourceforge.net/"
 license=('GPL2')
 depends=('libpng' 'libtiff')
 makedepends=('openjdk6')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/panotools/$pkgname-$pkgver.tar.gz)
-md5sums=('54ec7c505cf38521f2fbb6e2acd2c433')
+source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-#  sed -i 's:\(^.*MAX_FISHEYE_FOV.*\)160.*$:\1720.0:' filter.h
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
   make
-  make DESTDIR=$pkgdir install
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 9935e4c61..4c3853010 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,337 +1,307 @@
-# $Id: PKGBUILD 116748 2011-03-25 17:36:36Z andyrtr $
+# $Id: PKGBUILD 125824 2011-05-30 09:43:02Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
-pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-nlpsolver' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presenter-screen' 
-         'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-ct2n' 'libreoffice-extension-hunart' 'libreoffice-extension-numbertext'
-	 'libreoffice-extension-oooblogger' 'libreoffice-extension-typo' 'libreoffice-extension-watch-window' 'libreoffice-extension-diagram')
-_LOver=3.3.2.2
-pkgver=3.3.2
-pkgrel=2
+pkgname=('libreoffice' 'libreoffice-sdk' 
+	#'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.0.2
+pkgver=3.4.0
+pkgrel=1
 arch=('i686' 'x86_64')
-_LO_tree="3.3"
-_OFFICEUPD="330"
+#_LO_tree="3.4"
+_OFFICEUPD="340"
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'boost' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java'
-             'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
+             'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-              # for additional ooo-build features
-	         'mesa>=7.5' 'gstreamer0.10-base>=0.10.26'  #'mono>=2.6.1'
+	     'mesa' 'gstreamer0.10-base' 'java-runtime'
               #'saxon' - currently broken 
              # the depends from libreoffice main pkg
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.0' 'libxaw' "neon>=0.28.6"
+             "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' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'java-runtime' 'gtk2') # keep gtk2 for install script
+             'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat'
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script
+	     'ttf-dejavu') # to satisfy regression tests
+	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
-_mirror="http://download.documentfoundation.org/libreoffice/src"
-#_mirror="ftp://ftp.uni-muenster.de/pub/software/tdf/libreoffice/src"
-#_mirror="ftp://ftp.astral.ro/mirrors/tdf/libreoffice/src"
+#_mirror="http://download.documentfoundation.org/libreoffice/src"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src/"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
-source=(${_mirror}/${pkgbase}-build-${_LOver}.tar.gz
-	${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2
-	ArchLinux.patch
-	${_additional_source_url}/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-	${_additional_source_url}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
-	${_additional_source_url}/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-	${_additional_source_url}/68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
-	${_additional_source_url}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+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}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
-	${_additional_source_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-	${_additional_source_url}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-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}/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-	${_additional_source_url}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-	${_additional_source_url}/377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-	${_additional_source_url}/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
-	${_additional_source_url}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-	${_additional_source_url}/4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
-	${_additional_source_url}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-	${_additional_source_url}/5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
-	http://download.go-oo.org/src/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-	${_additional_source_url}/67b42915c8432abf0a922438f00860a2-libxml.zip
-	${_additional_source_url}/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
-	${_additional_source_url}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-	${_additional_source_url}/79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
-	${_additional_source_url}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-	${_additional_source_url}/8ea307d71d11140574bfb9fcc2487e33-libbase.zip
-	${_additional_source_url}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
-	${_additional_source_url}/a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
-	${_additional_source_url}/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-	${_additional_source_url}/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.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}/ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz
-	${_additional_source_url}/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
-	${_additional_source_url}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-	${_additional_source_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-	${_additional_source_url}/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
-	${_additional_source_url}/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
-	${_additional_source_url}/d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
-	${_additional_source_url}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
-	${_additional_source_url}/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-	${_additional_source_url}/dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
-	${_additional_source_url}/dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
-	${_additional_source_url}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
-	${_additional_source_url}/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
-	${_additional_source_url}/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-	${_additional_source_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
-	${_additional_source_url}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-	${_additional_source_url}/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-	${_additional_source_url}/f3e2febd267c8e4b13df00dac211dd6d-flute.zip
-	${_additional_source_url}/f7925ba8491fe570e5164d2c72791358-libfonts.zip
-	${_additional_source_url}/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
-	${_additional_source_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-	${_additional_source_url}/fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
-	${_additional_source_url}/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
-	${_additional_source_url}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-	${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
-	http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
-	http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
-	http://download.go-oo.org/src/debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
-	http://download.go-oo.org/src/5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
-	http://download.go-oo.org/src/5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2
-	http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
+	${_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/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.3.tar.bz2
-	http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz
-	http://download.go-oo.org//SRC680/extras-3.1.tar.bz2
-	http://download.go-oo.org//SRC680/biblio.tar.bz2
-	http://download.go-oo.org/src//0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
-	http://download.go-oo.org/src//e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
-	http://ftp.fsf.hu/OpenOffice.org_hu/numbertext/numbertext-0.9.3.oxt
-	http://ftp.fsf.hu/OpenOffice.org_hu/hunart/hunart-0.3.oxt
-	http://ftp.fsf.hu/OpenOffice.org_hu/typo/typo-0.3.oxt
+	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/ConvertTextToNumber-1.3.2.oxt
-	http://ftp.devall.hu/kami/go-oo/WatchWindow_1.2.0.0.oxt
-	http://ftp.devall.hu/kami/go-oo/Diagram_1.1.0.0.oxt
-	http://download.go-oo.org/src/oooblogger-0.1.oxt
-	buildfix_64bit_system_libjpeg.diff)
-#options=('!makeflags')
-noextract=(libreoffice-\
-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,l10n,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2)
-replaces=('openoffice-base')
-md5sums=('2f54261deaf89d8154440ea33bf12cc2'
-         'cd9f83d8dc2f85f06b2999fd3d23a74d'
-         '46fb3c85cc878daabb58d94fa848a59d'
-         '19698765fe35dcbb1f6d7d55c617c39f'
-         '0274eb33f462e620cb2f37aa696d18b1'
-         'a5f11a035faa6160121dd2d3f984065f'
-         'd54e5f7e5cde7f648d74e382eb5e44fc'
-         'db5d3a8886ec451c11e1ef3cea132ce0'
-         '4ae9b40116ef3f840b232cb3454be4e3'
-         '2dc8e4b347866f9469eb6c42a9cb0b81'
-         'e9211340b2a7f48c17883db76d1e8e03'
-         '688768909f823b5006162d27638aa15e'
-         '26ca2152535ba45bf71d8aa3b26fc967'
-         '9df0af97ec8d085864c5341678bb1d0d'
-         '09b22bf1a812affbfe561230940d7da2'
-         'e3dc1c328dfdf4a288946957c69ad32b'
-         '5c0a8203253d053f23613e68cdb69565'
-         '2e68a800e323fd3286a0a3305e3d3e39'
-         'e91523550f9cae015923685ad3fce5ad'
-         'a17434cc2469a263ffabd345e90d8911'
-         '6faf9924a74b836527906f49fcea40c2'
-         'a77cc2fdff90146485e0b1f1398bb0d4'
-         '63ddc5116488985e820075e65fbe6aa4'
-         '09357cc74975b01714e00c5899ea1881'
-         '0b49ede71c21c0599b0cc19b353a6cb3'
-         '68dd2e8253d9a7930e9fd50e2d7220d0'
-         '128cfc86ed5953e57fe0f5ae98b62c2e'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '1756c4fa6c616ae15973c104cd8cb256'
-         '18f577b374d60b3c760a3a3350407632'
+	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	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/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.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_i116795.diff
+	buildfix_boost.diff
+	buildfix_ct2n.diff
+	vbahelper.visibility.patch
+	buildfix_bison25.diff)
+noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.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
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
+md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa'
+         'a78a8e08731213da02c65060cedc5589'
+         '596da255e2728faccc8f2361171270ec'
+         '8ed9803a34d13da1764e7523d550d6b0'
+         '9be46d7c4bf3a60ee8dd0a5ef3638f82'
+         'b60db802866ab71c485de42e6382d1bb'
+         '09e374cf3bd8f07a043883393012d69b'
+         'af9f25aa04dc4ef7b797f7bcc743877c'
+         'ad29de786d76d67759f9d2dd574b29be'
+         'ff13a8ac0ea324122b75773fd80a9245'
+         '6eb8f53e01da7a945ee4cd42b7297732'
+         '90df27d4cbf490668ce4f03ff7dba521'
+         'c0ea197183564c49306a1c79ca571e51'
+         '91e69ed3c0be542fa7f69ca3da2d7808'
+         'a81c787b2e5469c2acc9f335b2c9e52f'
+         'ee1c78af6553657614b1a43adf4750ac'
+         'c970d6212618fc9b34526907eb030ce6'
+         '6d25488c81af09d87015bf487243042f'
+         '9a39234a49516b7035309e28dd4f0784'
          '1f24ab1d39f4a51faf22244c94a6203f'
-         '24be19595acad0a2cae931af77a0148a'
-         '26b3e95ddf3d9c077c480ea45874b3b8'
-         '284e768eeda0e2898b0d5bf7e26a016e'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '2f6ecca935948f7db92d925d88d0d078'
-         'ca4870d899fd7e943ffc310a5421ad4d'
          '35c94d2df8893241173de1d16b6034c0'
-         '35efabc239af896dfb79be7ebdd6e6b9'
-         '377a60170e5185eb63d3ed2fae98e621'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3ade8cfe7e59ca8e65052644fed9fca4'
-         '3c219630e4302863a9a83d0efde889db'
-         '48470d662650c3c074e1c3fabbc67bbd'
-         '48d8169acc35f97e05d8dcdfd45be7f2'
-         '4a660ce8466c9df01f19036435425c3a'
-         '4ea70ea87b47e92d318d4e7f5b940f47'
-         '599dc4cc65a07ee868cf92a667a913d2'
-         '5aba06ede2daa9f2c11892fbd7bc3057'
-         '71474203939fafbe271e1263e61d083e'
-         '67b42915c8432abf0a922438f00860a2'
-         '7740a8ec23878a2f50120e1faa2730f2'
-         '7376930b0d3f3d77a685d94c4a3acda8'
-         '79600e696a98ff95c2eba976f7a8dfbb'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'ecb2e37e45c9933e2a963cabe03670ab'
-         '8294d6c42e3553229af9934c5c0ed997'
-         '8ea307d71d11140574bfb9fcc2487e33'
-         'bd30e9cf5523cdfc019b94f5e1d7fd19'
-         'a06a496d7a43cbdc35e69dbe678efadb'
-         'a169ab152209200a7bad29a275cb0333'
-         'a4d9b30810a434a3ed39fc0003bbd637'
-         'a7983f859eafb2677d7ff386a023bc40'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
          'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
          'af3c3acf618de6108d65fcdc92b492e1'
-         'ba1015b59c112d44d7797b62fe7bee51'
-         'bc702168a2af16869201dbe91e46ae48'
-         'c441926f3a552ed3e5b274b62e86af16'
-         'ca66e26082cab8bb817185a116db809b'
-         'd0b5af6e408b8d2958f3d83b5244f5e8'
-         'd1a3205871c3c52e8a50c9f18510ae12'
-         'd35724900f6a4105550293686688bbb3'
-         'd4c4d91ab3a8e52a2e69d48d34ef4df4'
-         'd70951c80dabecc2892c919ff5d07172'
-         'dbb3757275dc5cc80820c0b4dd24ed95'
-         'dbd5f3b47ed13132f04c685d608a7547'
-         'e0707ff896045731ff99e99799606441'
-         'e81c2f0953aa60f8062c05a4673f2be0'
-         'e61d0364a30146aaa3001296f853b2b9'
-         'ea570af93c284aa9e5621cd563f54f4d'
-         'ea91f2fb4212a21d708aced277e6e85a'
-         'ee8b492592568805593f81f8cdf2a04c'
-         'f3e2febd267c8e4b13df00dac211dd6d'
-         'f7925ba8491fe570e5164d2c72791358'
-         'fb7ba5c2182be4e73748859967455455'
-         'fca8706f2c4619e2fa3f8f42f8fc1e9d'
-         'fcc6df1160753d0b8c835d17fdeeb0a7'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         '37282537d0ed1a087b1c8f050dc812d9'
-         '831126a1ee5af269923cfab6050769fe'
-         '067201ea8b126597670b5eff72e1f66c'
-         'cf8a6967f7de535ae257fa411c98eb88'
-         '881af2b7dca9b8259abbca00bbbc004d'
-         '47e1edaa44269bc537ae8cabebb0f638'
-         'debc62758716a169df9f62e6ab2bc634'
-         '5ba6a61a2f66dfd5fee8cdd4cd262a37'
-         '5ff846847dab351604ad859e2fd4ed3c'
-         '9e436bff44c60dc8b97cba0c7fc11a5c'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '18f577b374d60b3c760a3a3350407632'
+         '7a0dcb3fe1e8c7229ab4fb868b7325e6'
          '185d60944ea767075d27247c3162b3bc'
-         'fc46e64367c3b09a1668fb9ab40c031b'
-         '246e8f38b2a1af1bcff60ee0da59300b'
-         '1aa219782c41ff6cabef9ecaf147556f'
-         '1948e39a68f12bfa0b7eb309c14d940c'
-         '0f63ee487fda8f21fafa767b3c447ac9'
-         'e3738abd0d3ce1870dc1fd1f22bba5b1'
-         'a90f17aaccfb38be917732503740e6a2'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '2b3fcb8d061dbfc26bf7efbcfa6d7ae2'
+         'b4cae0700aa1c2aef7eb7f345365e6f1'
+         '451ccf439a36a568653b024534669971'
          '90401bca927835b6fbae4a707ed187c8'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
+         '41c9b65ad60af4b3255bbecdfef11736'
          '451ccf439a36a568653b024534669971'
+         'bbdd5639ada63e3130761daaecae1a10'
          '23bd75552206dfcd8fd4e29137dcac84'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'c1ce4ff1636394b3b4a2af23572159c9'
-         '7ef850978f435c32abc81862404936fc')
+         'b8cbca7b3363e6ca2d02bc0ba2b63904'
+         'b632bdd25649cc4067bcb410bae23d2b'
+         '9d60b6cfa3ef1926848710bbcd11115b'
+         'dbaafd21de055e582d92d7d32fe9da13'
+         'b7b2d0e04e142f26dd96119c80757d1f'
+         '0520d63c946e272ed3bdfc863fbdc42e'
+         'bc228237108cab7745897a9f466b6d39'
+         'eee273f501ff45dc5f1365e78c6d57c0'
+         '43b145db28e6c0d73578ae6fd35e510d'
+         '4fa96e04b41a6e86774e74a972024b3e')
 
 build() {
 
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
 	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
-	cd ${srcdir}/${pkgbase}-build-${_LOver}
+	# 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
 
-	# our ArchLinux distribution patch until we go upstream
-	patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
 
-	# hotfixes not yet upstream
-	# cp ${srcdir}/*.diff ${srcdir}/${pkgbase}-build-${_LOver}/patches/hotfixes/
-	cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/${pkgbase}-build-${_LOver}/patches/hotfixes/
+	cd ${srcdir}/build
 
-	# export C(XX)FLAGS
+	# buildfixes & bugfixes
+	patch -Np1 -i ${srcdir}/buildfix_i116795.diff
+	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}/buildfix_bison25.diff
+	
+	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-	unset CFLAGS
-	unset CXXFLAGS
-
+#	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
-	# mono2.8 hack
-#	sed -i -e "s/mkbundle2/mkbundle/g" patches/mono/*.diff || return 1
 
-	# fix dekstop menu entries
-	sed -i -e "s/Exec=oo/Exec=lo/g" desktop/*.desktop.in.in
-	sed -i -e "s/TryExec=oo/TryExec=lo/g" desktop/*.desktop.in.in
-	
 	# 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
-
-	./configure --with-distro=ArchLinux \
-		--with-build-version="${_LOver} ArchLinux build-${pkgrel}" \
-		--without-git \
-		--with-srcdir=${srcdir} \
-		--with-max-jobs=${MAKEFLAGS/-j/} \
-		--with-installed-ooo-dirname="${pkgbase}" \
+#	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
+
+#	autoconf -v -f
+
+	# non-SMP test build
+#	export MAKEFLAGS="-j1"
+	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-docdir=/usr/share/doc/packages/"${pkgbase}" \
-		--mandir=/usr/share/man \
+		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
-		--with-binsuffix=no \
+		--disable-verbose \
 		--enable-cairo\
-		--enable-crashdump\
+		--enable-crashdump \
+		--enable-dbus \
 		--enable-evolution2\
-		--enable-graphite\
-		--disable-gio\
+		--disable-graphite\
+		--enable-gio\
+		--disable-gnome-vfs\
 		--disable-kde\
-		--disable-mono\
 		--enable-kde4\
 		--enable-ldap \
 		--enable-lockdown\
 		--enable-opengl \
 		--enable-odk\
 		--enable-opengl\
-		--enable-ogltrans \
-		--enable-minimizer \
-		--enable-pdfimport \
-		--enable-presenter-console \
-		--enable-presenter-extra-ui\
-		--enable-report-builder\
-		--enable-wiki-publisher \
-		--with-ct2n \
-		--with-hunart \
-		--with-nlpsolver \
-		--with-numbertext \
-		--with-oooblogger \
-		--with-typo \
-		--with-watch-window \
-		--with-diagram \
+		--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-agg\
 		--without-system-libwps\
 		--without-system-mdds\
 		--without-myspell-dicts \
@@ -340,16 +310,19 @@ build() {
 		--with-external-hyph-dir=/usr/share/hyphen \
 		--with-external-thes-dir=/usr/share/mythes \
 		--with-system-cppunit\
-		--with-system-libwpg\
+		--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"\
-		--with-system-boost\
+		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
+		--with-system-mozilla\
 		--with-system-mythes\
-		--with-system-unixodbc-headers\
 		--with-system-xrender-headers\
 		--with-system-headers\
 		--with-alloc=system\
@@ -358,52 +331,35 @@ build() {
 		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 		$EXTRAOPTS || return 1
 
-#	seems no more needed
-#		--with-unix-wrapper="libreoffice" \
-
-#	not yet supported
-#		--enable-ext-presenter-minimizer \
-#		--enable-ext-pdfimport \
-#		--enable-ext-presenter-console \
-#		--enable-ext-presenter-extra-ui\
-#		--enable-ext-report-builder\
-#		--enable-ext-wiki-publisher \
-#		--enable-ext-ct2n \
-#		--enable-ext-hunart \
-#		--enable-ext-nlpsolver \
-#		--enable-ext-numbertext \
-#		--enable-ext-oooblogger \
-#		--enable-ext-typo \
-#		--enable-ext-watch-window \
-#		--enable-ext-diagram \
-
+#--with-system-graphite --enable-graohite ?
+#--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\
-		
-#		--enable-report-builder \	
-#		--with-additional-sections="OOXMLExport"
-
-#		--with-languagetool \
-#		--with-lightproof \
-#		--with-validator \
-#		--with-barcode \
 
+	touch src.downloaded
+	#./download
 	unset MAKEFLAGS
-	./download
-	LD_PRELOAD="" make
+	./bootstrap
+	make
 }
 
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
 package_libreoffice() {
 
  pkgdesc="a productivity suite that is compatible with other major office suites"
  install=${pkgbase}.install
- depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.0' 'libxaw' "neon>=0.28.6"
+ depends=("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' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'java-runtime' 'gtk2') # keep gtk2 for install script
+          'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat'
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script 
+	  #'java-runtime' 
           #'saxon'
- optdepends=( #'java-runtime:     adds java support'
+ optdepends=('java-runtime:     adds java support'
              'libcups:          adds printing support'
              'gconf:            adds additional gnome support'
              'nss:              adds support for signed files/macros'
@@ -422,40 +378,68 @@ package_libreoffice() {
              'unixodbc:         adds ODBC database support'
              'mesa:             for the OGLTrans extension'
              'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
-#             'mono:             allows UNO automation with Mono'
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
- provides=('go-openoffice') #'openoffice-base' 
- conflicts=('go-openoffice') #'openoffice-base' 
- replaces=('go-openoffice')
-
-	cd ${srcdir}/${pkgbase}-build-${_LOver}
-	#bin/ooinstall <path-to-install>
-	LD_PRELOAD="" make DESTDIR=${pkgdir} install
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' )
 
+	cd ${srcdir}/build
+	make DESTDIR=${pkgdir} install
+	
+	# fix missing desktop integration
+	install -dm755 ${pkgdir}/usr/bin
+	pushd ${pkgdir}/usr/bin
+	ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice
+	ln -vs /usr/lib/libreoffice/program/soffice ./soffice
+	ln -vs /usr/lib/libreoffice/program/sbase ./lobase
+	ln -vs /usr/lib/libreoffice/program/scalc ./localc
+	ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw
+	ln -vs /usr/lib/libreoffice/program/simpress ./loimpress
+	ln -vs /usr/lib/libreoffice/program/smath ./lomath
+	ln -vs /usr/lib/libreoffice/program/swriter ./lowriter
+	ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg
+	popd
+	
 	# move sysui desktop files into place we want to use - javafilter and qstarter, but not unneeded printeradmin
-	cp ${pkgdir}/usr/lib/libreoffice/share/xdg/javafilter.desktop ${pkgdir}/usr/share/applications/
-	sed -i -e "s/Exec=oo/Exec=so/g" ${pkgdir}/usr/share/applications/javafilter.desktop # https://bugs.archlinux.org/task/23361
-	cp ${pkgdir}/usr/lib/libreoffice/share/xdg/qstart.desktop ${pkgdir}/usr/share/applications/
+	install -dm755 ${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps}
+	rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop
+	for i in base calc draw impress javafilter math qstart startcenter writer; do
+	  cp ${pkgdir}/usr/lib/libreoffice/share/xdg/$i.desktop ${pkgdir}/usr/share/applications/libreoffice-$i.desktop
+	done
 	# remove version in menu entry and make it visible
-	sed -i -e "s/3.3 Quickstarter/Quickstarter/g" ${pkgdir}/usr/share/applications/qstart.desktop
-	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/qstart.desktop
-	# remove unneeded .desktop files from vanilla sysui
+	sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop
+	sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop
+	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+	# remove unneeded .desktop files
 	rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg
+	
+	# add missing icon files
+	cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color ${pkgdir}/usr/share/icons/
+	pushd ${pkgdir}/usr/share/pixmaps
+	  for i in base calc draw impress main math printeradmin startcenter writer; do
+	    ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png .
+	  done
+	popd
+	sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop
+
+	# add missing mimetype file
+	install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml
 
 	# 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.3/share/psprint/psprint.conf ${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.3/share/psprint/
+	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 ls -lh {} \;
 	find ${pkgdir} -perm 444 -exec chmod 644 {} \;
 	find ${pkgdir} -perm 555 -exec ls -lh {} \;
 	find ${pkgdir} -perm 555 -exec chmod 755 {} \;
@@ -466,153 +450,209 @@ package_libreoffice() {
 	install -m644 ${srcdir}/extensions-install/package.txt ${pkgdir}/usr/lib/libreoffice/share/extensions/
 
 	# move SDK to separated package
-	mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.3/sdk
-	mv ${pkgdir}/usr/lib/libreoffice/basis3.3/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.3/
-
-	mkdir -p ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
-	mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/
-
-	mkdir -p ${srcdir}/sdk-install/usr/share/libreoffice/sdk
-	mv ${pkgdir}/usr/share/libreoffice/sdk ${srcdir}/sdk-install/usr/share/libreoffice/
-
-	mkdir -p ${srcdir}/sdk-install/usr/share/idl/libreoffice
-	mv ${pkgdir}/usr/share/idl/libreoffice ${srcdir}/sdk-install/usr/share/idl/
+	mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk
+	mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/
 
-	mkdir -p ${srcdir}/sdk-install/usr/include/libreoffice
-	mv ${pkgdir}/usr/include/libreoffice ${srcdir}/sdk-install/usr/include/
+	# cleanup gid_Module files
+	mkdir ${srcdir}/splitlist
+	mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/
 }
 
 package_libreoffice-sdk() {
 
  pkgdesc="Software development kit for LibreOffice"
- depends=('libreoffice')
+ depends=('libreoffice' 'gcc-libs' 'sh')
 
 	cd ${srcdir}/sdk-install
 	cp -r * ${pkgdir}
 
-	cd ${pkgdir}/usr/lib/libreoffice/basis3.3/sdk
-	for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
-          chmod 755 $file
-	done
+	cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
+	mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh
+	rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
 	#fix permissions
 	find examples -type f -exec chmod -x {} \;
 }
 
-package_libreoffice-extension-nlpsolver() {
+package_libreoffice-extension-barcode() {
 
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
+ pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
  #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	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-pdfimport() {
+package_libreoffice-extension-diagram() {
 
- pkgdesc="This extension allows you to import and modify PDF documents"
+ pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
+ #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
 }
 
-package_libreoffice-extension-presentation-minimizer() {
+package_libreoffice-extension-google-docs() {
 
- pkgdesc="This extension reduce the file size of the current presentation"
+ pkgdesc="Google Documents extension for LibreOffice"
+ #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
 }
 
-package_libreoffice-extension-presenter-screen() {
+package_libreoffice-extension-hunart() {
 
- 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"
+ pkgdesc="Hungarian cross-reference toolbar extension"
+ #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
 }
 
-package_libreoffice-extension-report-builder() {
+#package_libreoffice-extension-lightproof() {
 
- pkgdesc="This extension creates smart-looking database reports"
+# pkgdesc="Lightproof extension for LibreOffice"
+ #arch=('any')
+# depends=('libreoffice')
+# 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')
+# 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')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }
 
-package_libreoffice-extension-wiki-publisher() {
+package_libreoffice-extension-ct2n() {
 
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
+ pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
  #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
 }
 
-package_libreoffice-extension-ct2n() {
+package_libreoffice-extension-numbertext() {
 
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
+ pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
  #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber-1.3.2.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
+	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
 }
 
-package_libreoffice-extension-hunart() {
+package_libreoffice-extension-oooblogger() {
 
- pkgdesc="Hungarian cross-reference toolbar extension"
+ pkgdesc="An extensions for blogging"
  #arch=('any')
+ depends=('libreoffice' 'coreutils')
+ 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' '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')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
 }
 
-package_libreoffice-extension-numbertext() {
+package_libreoffice-extension-presentation-minimizer() {
 
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice' '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')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
+	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
 }
 
-package_libreoffice-extension-oooblogger() {
+package_libreoffice-extension-scripting-beanshell() {
 
- pkgdesc="An extensions for blogging"
- #arch=('any')
+ pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
+ depends=('libreoffice')
+ 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')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger-0.1.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
+	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')
+ 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() {
@@ -623,30 +663,39 @@ package_libreoffice-extension-typo() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+	chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
 }
 
-package_libreoffice-extension-watch-window() {
+package_libreoffice-extension-validator() {
 
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
+ pkgdesc="Validator extension for LibreOffice"
  #arch=('any')
  depends=('libreoffice')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
+	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
 }
 
-package_libreoffice-extension-diagram() {
+package_libreoffice-extension-wiki-publisher() {
 
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
+ 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')
+ 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')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
-	unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
+	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
 }
diff --git a/extra/libreoffice/buildfix_bison25.diff b/extra/libreoffice/buildfix_bison25.diff
new file mode 100644
index 000000000..869b6c81e
--- /dev/null
+++ b/extra/libreoffice/buildfix_bison25.diff
@@ -0,0 +1,23 @@
+--- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
++++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
+@@ -4338,7 +4338,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+ 	if(!m_sErrorMessage.getLength())
+ 	{
+--- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
++++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
+@@ -233,7 +233,7 @@
+         // returns the type for a parameter in a given function name
+         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
+ 
+-        void error(sal_Char *fmt);
++        void error(const sal_Char *fmt);
+         int SQLlex();
+ #ifdef YYBISON
+         void setParseTree(OSQLParseNode * pNewParseTree);
+
diff --git a/extra/libreoffice/buildfix_boost.diff b/extra/libreoffice/buildfix_boost.diff
new file mode 100644
index 000000000..d8608d0d4
--- /dev/null
+++ b/extra/libreoffice/buildfix_boost.diff
@@ -0,0 +1,40 @@
+From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Tue, 05 Apr 2011 14:07:02 +0000
+Subject: silence some more of that annoying gcc#47679
+
+---
+diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
+index 1c804aa..9b33a5f 100644
+--- a/boost/boost.gcc47679.patch
++++ b/boost/boost.gcc47679.patch
+@@ -36,3 +36,26 @@
+          template <int MaxDigits>
+          inline bool allow_more_digits(std::size_t i)
+          {
++--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
+++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
++@@ -31,6 +31,8 @@
++ 
++ #include "boost/optional/optional_fwd.hpp"
++ 
+++#include <string.h>
+++
++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
++ // VC6.0 has the following bug:
++ //   When a templated assignment operator exist, an implicit conversion
++@@ -114,6 +116,11 @@
++ 
++   public:
++ 
+++    aligned_storage()
+++    {
+++      memset(&dummy_, 0, sizeof(dummy_));
+++    }
+++
++     void const* address() const { return &dummy_.data[0]; }
++     void      * address()       { return &dummy_.data[0]; }
++ } ;
+--
+cgit v0.8.3-6-g21f6
+
diff --git a/extra/libreoffice/buildfix_ct2n.diff b/extra/libreoffice/buildfix_ct2n.diff
new file mode 100644
index 000000000..979587f79
--- /dev/null
+++ b/extra/libreoffice/buildfix_ct2n.diff
@@ -0,0 +1,17 @@
+From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Tue, 12 Apr 2011 19:35:51 +0000
+Subject: duplicate NULLs
+
+---
+diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
+index 91f44b7..714d926 100644
+--- a/ct2n/prj/build.lst
++++ b/ct2n/prj/build.lst
+@@ -1,3 +1,3 @@
+-ct2n	ct2n	:	solenv NULL NULL
++ct2n	ct2n	:	solenv NULL
+ ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
+ ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
+--
+cgit v0.8.3-6-g21f6
diff --git a/extra/libreoffice/buildfix_i116795.diff b/extra/libreoffice/buildfix_i116795.diff
new file mode 100644
index 000000000..8601bc164
--- /dev/null
+++ b/extra/libreoffice/buildfix_i116795.diff
@@ -0,0 +1,22 @@
+diff -r 4ab9e11cb892 connectivity/qa/makefile.mk
+--- a/connectivity/qa/makefile.mk	Thu Mar 03 15:22:23 2011 +0100
++++ b/connectivity/qa/makefile.mk	Fri Mar 04 09:51:48 2011 +0100
+@@ -35,9 +35,16 @@
+ 
+ #----- compile .java files -----------------------------------------
+ 
+-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+ JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
+ 
++JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
++
++.IF "$(SYSTEM_HSQLDB)" == "YES"
++EXTRAJARFILES = $(HSQLDB_JAR)
++.ELSE
++JARFILES += hsqldb.jar
++.ENDIF
++
+ #----- make a jar from compiled files ------------------------------
+ 
+ JARCLASSDIRS = $(PACKAGE)
+
diff --git a/extra/libreoffice/vbahelper.visibility.patch b/extra/libreoffice/vbahelper.visibility.patch
new file mode 100644
index 000000000..5739100d0
--- /dev/null
+++ b/extra/libreoffice/vbahelper.visibility.patch
@@ -0,0 +1,33 @@
+--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
+@@ -238,7 +238,7 @@
+ 
+ // including a HelperInterface implementation
+ template< typename Ifc1 >
+-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+ {
+ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
+ protected:
+--- sc/Library_vbaobj.mk
++++ sc/Library_vbaobj.mk
+@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbaquerytable \
+         sc/source/ui/vba/vbarange \
+         sc/source/ui/vba/vbasheetobject \
+-        sc/source/ui/vba/vbasheetobjects \
+         sc/source/ui/vba/vbastyle \
+         sc/source/ui/vba/vbastyles \
+         sc/source/ui/vba/vbatextboxshape \
+@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbawsfunction \
+ ))
+ 
++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
++        sc/source/ui/vba/vbasheetobjects \
++        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
++))
++
+ ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
+ $(eval $(call gb_Library_set_ldflags,vbaobj,\
+ 	$$(LDFLAGS) \
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index e8f8f6e25..f9800e4ae 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122137 2011-05-02 10:27:04Z giovanni $
+# $Id: PKGBUILD 126289 2011-06-04 09:29:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.8.3
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('python2')
 optdepends=('tk: for the hgk GUI')
 source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz
         mercurial.profile)
-md5sums=('7afea936dfdb21220064cac6402f8743'
+md5sums=('b3dcc3de473e003dd1cc0500dcd9de47'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 build() {
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index ef8bbe171..306b2e386 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 117753 2011-04-04 17:40:52Z andyrtr $
+# $Id: PKGBUILD 126340 2011-06-04 23:48:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,7 @@ _openjdk_version=b22
 _openjdk_date=28_feb_2011
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -27,7 +27,6 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
 	https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
-	aatext_by_default.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
 	openjdk6.profile
@@ -40,7 +39,6 @@ md5sums=('f3b31b9f591afc752372addacb1eb335'
          'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ef60d567c0d9bad111212851220deafd'
          'ee1afda124d5927345014ab382ef581e'
          '409812b5675f9678b1c9e1a12a945a9a'
          '74c4a7adc782edd087802bf92ae3d6d0'
@@ -76,7 +74,7 @@ build() {
 
   autoreconf -i
 
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 01239bbc0..684da1bf2 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 115794 2011-03-21 16:03:23Z andyrtr $
+# $Id: PKGBUILD 126317 2011-06-04 16:06:41Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
 source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz)
-md5sums=('b0f874c200c4b3214b5bf4806ae82353')
+md5sums=('46eff4b20f8752d1146a3e0c8b2168dd')
 
 build() {
   cd ${srcdir}/raptor2-${pkgver}
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index e54d2ecb6..330a34938 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125719 2011-05-28 14:45:23Z giovanni $
+# $Id: PKGBUILD 126365 2011-06-05 01:44:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.9
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index 98f79e4db..d662d4958 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120152 2011-04-20 16:40:20Z andyrtr $
+# $Id: PKGBUILD 126312 2011-06-04 15:24:03Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.0
+pkgver=0.5.4.1
 pkgrel=1
 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3ea1efe366367af660e6e1d24a240b5f')
+md5sums=('8512c0b180004e1150d8c05255c202d8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index c4ab9c387..360ddd8aa 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 119595 2011-04-12 15:34:48Z eric $
+# $Id: PKGBUILD 126345 2011-06-04 23:54:53Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=xvidcore
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
 arch=('i686' 'x86_64')
-license=('GPL')
 url="http://www.xvid.org/"
+license=('GPL')
 depends=('glibc')
 makedepends=('nasm')
 source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5b1c7032809bef6fa11eb3f4fbcf78e4')
-sha1sums=('15acd3bbd4ddd39ffec7bc14f7cc2c9fe08e01c3')
+md5sums=('34389e980d4f849688f8b1e168f4e2f9')
+sha1sums=('74f9ce9c1bebcc9806bf21cb53274b8102700309')
 
 build() {
   cd "${srcdir}/${pkgname}/build/generic"