Sun Mar 16 03:32:40 UTC 2014

33 files changed, 1172 insertions, 1086 deletions

diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD
index f7e1d6723..a3f89e8ec 100644
--- a/community/asunder/PKGBUILD
+++ b/community/asunder/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 103408 2014-01-05 18:15:51Z xyne $
+# $Id: PKGBUILD 107259 2014-03-15 15:02:58Z xyne $
 # Maintainer: Xyne <ac xunilhcra enyx, backwards>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: cs-cam - me.at.camdaniel.com
 # Contributor: Sebastien Piccand <sebcactus gmail com>
 
 pkgname=asunder
-pkgver=2.4
-pkgrel=2
+pkgver=2.5
+pkgrel=1
 pkgdesc="a graphical CD ripper and encoder"
 arch=('i686' 'x86_64')
 url="http://littlesvr.ca/asunder/"
@@ -16,8 +16,8 @@ makedepends=('pkgconfig' 'intltool' 'gettext')
 optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \
 	'flac: for flac support')
 source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('11d36dcff71797e34a8e225e8fbd9e15')
-sha256sums=('90c2e13891697062661f3c1614b8781ce2e42963135174b8ba3ed6c3931cd293')
+md5sums=('43039a7cb7f6195d08a1203a7840f48e')
+sha256sums=('0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20')
 install="$pkgname".install
 
 build() {
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index b9efd89fa..52b0fd4f7 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,40 +1,49 @@
-# $Id: PKGBUILD 99804 2013-10-30 23:49:26Z allan $
+# $Id: PKGBUILD 107245 2014-03-15 11:25:10Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
 
 pkgname=guake
 pkgver=0.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Drop-down terminal for GNOME'
 arch=('i686' 'x86_64')
 url="http://guake.org/"
 license=('GPL')
 depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool')
+makedepends=('intltool' 'gnome-common')
 install=$pkgname.install
-source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
+source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
         guake-fix-notification.patch)
-md5sums=('532adada29b8f0bb79dc15904aa6b70c'
+md5sums=('06b424ae32c7e63a8256922f1e8c51b6'
          '0b57227e6869dd84dd4fb0794ed0d082')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
+
+  # Fix GConf schema dir
+  sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.am
+
+  # Python2 fix
   sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
 
-  # http://guake.org/ticket/416
+  # Runtime fix when no notification server available
   patch -Np1 -i "$srcdir/guake-fix-notification.patch"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-              PYTHON=python2
+  # Fix build
+  sed -i '/AM_INIT_AUTOMAKE/ s/-Werror//' configure.ac
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static --disable-schemas-install \
+               --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+               PYTHON=python2
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/mate-control-center/PKGBUILD b/community/mate-control-center/PKGBUILD
index 1d779b917..0152a3dc8 100644
--- a/community/mate-control-center/PKGBUILD
+++ b/community/mate-control-center/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-control-center
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="The Control Center for MATE"
 url="http://mate-desktop.org"
@@ -13,10 +13,9 @@ depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-sche
          'libxt' 'startup-notification')
 makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
 optdepends=('yelp: for reading MATE help documents')
-options=('!emptydirs')
 groups=('mate')
 source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d65088d1d7e9cf20aac466c98622f579979dc396')
+sha1sums=('9b7b5e0dee5bf7781bc186d97d0d5706ecb04631')
 install=${pkgname}.install
 
 build() {
diff --git a/community/mate-session-manager/PKGBUILD b/community/mate-session-manager/PKGBUILD
index fb006dcc8..7eeebed2c 100644
--- a/community/mate-session-manager/PKGBUILD
+++ b/community/mate-session-manager/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-session-manager
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="The MATE Session Handler"
 url="http://mate-desktop.org"
@@ -11,10 +11,9 @@ depends=('dbus-glib' 'gtk2' 'libsm' 'libxtst' 'mate-desktop' 'mate-polkit'
          'mate-settings-daemon' 'upower' 'xdg-user-dirs')
 makedepends=('mate-common' 'perl-xml-parser' 'xmlto')
 optdepends=('xdg-user-dirs-gtk: Add autostart that prompts to rename user directories when switching locales')
-options=('!emptydirs')
 groups=('mate')
 source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2dbb537ba2cc31a8d4f1fa02afd6dabc2919aaa3')
+sha1sums=('af07f12aaad1c6fd7626dfcf95c01c519bde3819')
 install=${pkgname}.install
 
 build() {
diff --git a/community/pcurses/PKGBUILD b/community/pcurses/PKGBUILD
index 1cc5e1827..938b46944 100644
--- a/community/pcurses/PKGBUILD
+++ b/community/pcurses/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=pcurses
-pkgver=3
-pkgrel=2
+pkgver=4
+pkgrel=1
 pkgdesc='A curses package management tool using libalpm'
 arch=('x86_64' 'i686')
 url="https://github.com/schuay/$pkgname"
diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD
index d334ded2e..cbe5160cb 100644
--- a/community/python-sfml/PKGBUILD
+++ b/community/python-sfml/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=python-sfml
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The unofficial Python binding for SFML"
 arch=('i686' 'x86_64')
 url="http://python-sfml.org"
@@ -22,6 +22,6 @@ package() {
 
 	python setup.py install --root="${pkgdir}" --prefix=/usr
 
-	# Copying the License file
+	# Copy the license file
 	install -D -m644 "$srcdir/python-sfml/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 7789510de..871951917 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105344 2014-02-05 15:34:54Z arodseth $
+# $Id: PKGBUILD 107235 2014-03-15 09:42:59Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jeff Horelick <jdhore1@gmail.com>
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname=the_silver_searcher
-pkgver=0.19.2
+pkgver=0.20.0
 pkgrel=1
 pkgdesc='Code searching tool similar to Ack, but faster'
 url='https://github.com/ggreer/the_silver_searcher'
@@ -12,7 +12,7 @@ license=('Apache')
 depends=('pcre' 'zlib' 'xz')
 arch=('x86_64' 'i686')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('e2de31b8b4745b4614d3a6fa4cd61130474b0e861e80b3784daee7ce0eeca300')
+sha256sums=('6691b095232f5c7f376075d1a5797b4d1740a2d83b6111a3f6227dc43c22cb13')
 
 prepare() {
   cd "$pkgname-$pkgver"
diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD
index 2571b8dee..899e9b240 100644
--- a/community/tint2/PKGBUILD
+++ b/community/tint2/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 97618 2013-09-25 18:19:34Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 107237 2014-03-15 10:43:27Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Blue Peppers <bluepeppers@archlinux.us>
 # Contributor: Stefan Husmann< stefan-husmann@t-online.de>
 
 pkgname=tint2
 pkgver=0.11
-pkgrel=6
+pkgrel=7
 pkgdesc='Basic, good-looking task manager for WMs'
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/tint2/"
+arch=('x86_64' 'i686')
+url='http://code.google.com/p/tint2/'
 license=('GPL2')
 conflicts=('ttm-svn' 'tint')
 replaces=('tint')
@@ -16,21 +17,29 @@ depends=('gtk2' 'imlib2')
 optdepends=('pygtk: for tint2wizard')
 makedepends=('pygtk' 'cmake')
 provides=('tint')
-source=(http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2
-        add-power-now-support.patch
-        fix_defunct_processes.patch
-        middle_click_on_clock.patch)
+source=("http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2"
+        'add-power-now-support.patch'
+        'clock.patch'
+        'launcher_apps_dir-v2.patch'
+        'src-task-align.patch'
+        'zombie-fix.patch')
 md5sums=('6fc5731e7425125fa84a2add5cef4bff'
-         '6cfcad028f1bd2f69812167f5395f890'
-         'b3d052ac5ada81c56e36133b1ecdee8c'
-         'f7918d29a87422aab6fb9d922867d8f8')
+         '448beead6c9d44b864f99e08a027cb56'
+         'bc0bab2979dacff551a97bdf2c2fdedc'
+         '13218765dd684ae825967d3ffb4f4a75'
+         'f0d7f51ec8dbf2e7b6bcca942f0fd6c0'
+         'cdb83cd911e005a3529e5d1cd952a956')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd "$pkgname-$pkgver"
 
-  patch -Np0 -i ../add-power-now-support.patch
-  patch -Np0 -i ../fix_defunct_processes.patch
-  patch -Np0 -i ../middle_click_on_clock.patch
+  # Applying all patches, even some that only applies partially.
+  # Tint2 works fine with these, but a new release from upstream would be nice.
+  for f in ../*.patch; do
+    echo -e "--- ${f##*/} ---\n"
+    patch -Np1 -i $f && echo "${f##*/} OK!" || echo "${f##*/} FAILED!"
+    echo
+  done
 
   # python2 fix
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/tint2conf/tintwizard.py
@@ -38,13 +47,18 @@ prepare() {
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd "$pkgname-$pkgver"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  mkdir -p build
+  cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_TINT2CONF=0
   make 
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver/build" DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tint2/add-power-now-support.patch b/community/tint2/add-power-now-support.patch
index 5057043df..6123f2786 100644
--- a/community/tint2/add-power-now-support.patch
+++ b/community/tint2/add-power-now-support.patch
@@ -1,6 +1,6 @@
-diff -rup ../tint2-0.11.orig/src/battery/battery.c ./src/battery/battery.c
---- ../tint2-0.11.orig/src/battery/battery.c	2010-12-02 23:56:11.313403140 +0100
-+++ ./src/battery/battery.c	2010-12-02 23:57:22.266956142 +0100
+diff -rup trunk/src/battery/battery.c ./src/battery/battery.c
+--- trunk/src/battery/battery.c	2010-12-02 23:56:11.313403140 +0100
++++ trunk/src/battery/battery.c	2010-12-02 23:57:22.266956142 +0100
 @@ -184,8 +184,14 @@ void init_battery()
  		}
  		g_free(path2);
diff --git a/community/tint2/middle_click_on_clock.patch b/community/tint2/clock.patch
index 800c15c44..2b3857315 100644
--- a/community/tint2/middle_click_on_clock.patch
+++ b/community/tint2/clock.patch
@@ -3,14 +3,16 @@ Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com>
 Date: 18-05-2013
 Initial Package Version: subversion trunk (revision 652)
 Description: Implemented middle click mouse button in the clock to execute tasks.
-* Implemented middle click mouse button over the clock by accepting the button 2 in the clock_action. 
-* A new configuration parameter was created called clock_mclick_command, which works in the same way 
+* Implemented middle click mouse button over the clock by accepting the button 2 in the 
+clock_action. 
+* A new configuration parameter was created called clock_mclick_command, which works in 
+the same way 
 * clock_lclick_command and clock_rclick_command does.
 
-Index: src/clock/clock.c
+Index: trunk/src/clock/clock.c
 ===================================================================
---- src/clock/clock.c	(revision 652)
-+++ src/clock/clock.c	(working copy)
+--- trunk/src/clock/clock.c	(revision 652)
++++ trunk/src/clock/clock.c	(working copy)
 @@ -39,6 +41,7 @@
  char *time_tooltip_format;
  char *time_tooltip_timezone;
@@ -45,10 +47,10 @@ Index: src/clock/clock.c
  		case 3:
  		command = clock_rclick_command;
  		break;
-Index: src/clock/clock.h
+Index: trunk/src/clock/clock.h
 ===================================================================
---- src/clock/clock.h	(revision 652)
-+++ src/clock/clock.h	(working copy)
+--- trunk/src/clock/clock.h	(revision 652)
++++ trunk/src/clock/clock.h	(working copy)
 @@ -33,6 +33,7 @@
  extern PangoFontDescription *time1_font_desc;
  extern PangoFontDescription *time2_font_desc;
@@ -57,10 +59,10 @@ Index: src/clock/clock.h
  extern char *clock_rclick_command;
  extern int clock_enabled;
  
-Index: src/config.c
+Index: trunk/src/config.c
 ===================================================================
---- src/config.c	(revision 652)
-+++ src/config.c	(working copy)
+--- trunk/src/config.c	(revision 652)
++++ trunk/src/config.c	(working copy)
 @@ -396,6 +396,10 @@
  		if (strlen(value) > 0)
  			clock_lclick_command = strdup(value);
@@ -73,3 +75,4 @@ Index: src/config.c
  		if (strlen(value) > 0)
  			clock_rclick_command = strdup(value);
 
+
diff --git a/community/tint2/launcher_apps_dir-v2.patch b/community/tint2/launcher_apps_dir-v2.patch
new file mode 100644
index 000000000..6dde4ed7e
--- /dev/null
+++ b/community/tint2/launcher_apps_dir-v2.patch
@@ -0,0 +1,100 @@
+Index: trunk/src/config.c
+===================================================================
+--- trunk/src/config.c	(revision 646)
++++ trunk/src/config.c	(working copy)
+@@ -583,6 +583,18 @@
+ 		char *app = strdup(value);
+ 		panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
+ 	}
++	else if (strcmp(key, "launcher_apps_dir") == 0) {
++
++		GList *list = dir_scan_alpha(value, "*.desktop");
++
++		for (list = g_list_first(list); list; list = g_list_next(list)) {
++			fprintf(stderr, "Add launcher app: %s\n", (const char *)list->data);
++			panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, (char *)strdup((const char *)list->data));
++		}
++
++		// Cleanup
++		g_list_free_full(list, g_free);
++	}
+ 	else if (strcmp(key, "launcher_icon_theme") == 0) {
+ 		// if XSETTINGS manager running, tint2 use it.
+ 		if (!icon_theme_name)
+Index: trunk/src/util/common.c
+===================================================================
+--- trunk/src/util/common.c	(revision 646)
++++ trunk/src/util/common.c	(working copy)
+@@ -22,10 +22,13 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/extensions/Xrender.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <fnmatch.h>
+ 
+ #include "common.h"
+ #include "../server.h"
+@@ -342,3 +345,46 @@
+ 	XRenderFreePicture(server.dsp, pict_image);
+ 	XRenderFreePicture(server.dsp, pict_drawable);
+ }
++
++/**
++ * @brief
++ *  Scan given directory for files which are meet the given mask and sort them alphabetically
++ *
++ * @param path	- directory path
++ * @param mask	- filename mask
++ *
++ * @return files list
++ */
++GList *dir_scan_alpha(const char *path, const char *mask)
++{
++	GError *err = NULL;
++	GList *list = NULL;
++	const char *n;
++	gchar *fn;
++	struct stat st;
++
++	GDir *dir = g_dir_open(path, 0, &err);
++
++	if (!dir) {
++		fprintf(stderr, "%s\n", err->message);
++		g_error_free(err);
++	} else {
++		// Enumerate files
++		while ((n = g_dir_read_name(dir))) {
++			if (!fnmatch(mask, n, FNM_PATHNAME)) {
++				fn = g_build_filename(path, n, NULL);
++
++				if (stat((char *)fn, &st) < 0)
++					continue;
++
++				// Only regular files
++				if (S_ISREG(st.st_mode))
++					list = g_list_prepend(list, (gpointer)fn);
++			}
++		}
++
++		list = g_list_sort (list, (GCompareFunc) &strcmp);
++	}
++
++	return list;
++}
+Index: trunk/src/util/common.h
+===================================================================
+--- trunk/src/util/common.h	(revision 646)
++++ trunk/src/util/common.h	(working copy)
+@@ -57,5 +57,7 @@
+ void createHeuristicMask(DATA32* data, int w, int h);
+ 
+ void render_image(Drawable d, int x, int y, int w, int h);
++
++GList *dir_scan_alpha(const char *path, const char *mask);
+ #endif
+ 
diff --git a/community/tint2/src-task-align.patch b/community/tint2/src-task-align.patch
new file mode 100644
index 000000000..937725b67
--- /dev/null
+++ b/community/tint2/src-task-align.patch
@@ -0,0 +1,115 @@
+Index: trunk/src/panel.h
+===================================================================
+--- trunk/src/panel.h	(revision 639)
++++ trunk/src/panel.h	(working copy)
+@@ -61,6 +61,9 @@
+ extern int panel_strut_policy;
+ extern char *panel_items_order;
+ 
++// tasks alignment
++enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT };
++
+ extern int  max_tick_urgent;
+ 
+ extern GArray* backgrounds;
+Index: src/config.c
+===================================================================
+--- trunk/src/config.c	(revision 639)
++++ trunk/src/config.c	(working copy)
+@@ -484,6 +484,14 @@
+ 		if (value2) panel_config.g_task.area.paddingy = atoi (value2);
+ 		if (value3) panel_config.g_task.area.paddingx = atoi (value3);
+ 	}
++	else if (strcmp (key, "task_align") == 0) {
++		extract_values(value, &value1, &value2, &value3);
++		printf("task_align: %s\n", value1);
++		if (strcmp (value1, "left") == 0) panel_config.g_task.align = ALIGN_LEFT;
++		else if (strcmp (value1, "center") == 0) panel_config.g_task.align = ALIGN_CENTER;
++		else if (strcmp (value1, "right") == 0) panel_config.g_task.align = ALIGN_RIGHT;
++		else fprintf(stderr, "Unknown value for task_align: %s\n", value1);
++	}
+ 	else if (strcmp (key, "task_font") == 0) {
+ 		panel_config.g_task.font_desc = pango_font_description_from_string (value);
+ 	}
+Index: trunk/src/taskbar/task.h
+===================================================================
+--- trunk/src/taskbar/task.h	(revision 639)
++++ trunk/src/taskbar/task.h	(working copy)
+@@ -26,6 +26,7 @@
+ 	int text;
+ 	int icon;
+ 	int centered;
++	int align;
+ 
+ 	int icon_posy;
+ 	int icon_size1;
+Index: trunk/src/util/area.c
+===================================================================
+--- trunk/src/util/area.c	(revision 639)
++++ trunk/src/util/area.c	(working copy)
+@@ -130,6 +130,54 @@
+ }
+ 
+ 
++// calculate total size of all children including
++// parent's padding
++int children_size(Area *a, int horizontal)
++{
++	int size = 0;
++	GSList *l;
++
++	for (l = a->list; l; l = l->next) {
++		Area *child = ((Area*)l->data);
++		if (!child->on_screen) continue;
++
++		if (horizontal)
++			size += child->width + a->paddingx;
++		else
++			size += child->height + a->paddingy;
++	}
++
++	return size;
++}
++
++
++// calculate chilren's align offset depending on the align type
++int align_offset(Area *a, int align, int horizontal)
++{
++	int size = 0;
++	int child_size = children_size(a, horizontal);
++
++	if (horizontal)
++		size = a->width;
++	else
++		size = a->height;
++
++	switch (align) {
++	case ALIGN_LEFT:
++		return 0;
++
++	case ALIGN_CENTER:
++		return (size - child_size) / 2;
++
++	case ALIGN_RIGHT:
++		return size - child_size;
++
++	default:
++		return 0;
++	}
++}
++
++
+ void size_by_layout (Area *a, int pos, int level)
+ {
+ 	// don't resize hiden objects
+@@ -179,7 +227,9 @@
+ 		int k;
+ 		for (k=0 ; k < level ; k++) printf("  ");
+ 		printf("tree level %d, object %d, pos %d, %s\n", level, i, pos, (child->size_mode == SIZE_BY_LAYOUT) ? "SIZE_BY_LAYOUT" : "SIZE_BY_CONTENT");*/
+-		size_by_layout(child, pos, level+1);
++
++		int offset = align_offset(child, panel_config.g_task.align, panel_horizontal);
++		size_by_layout(child, pos + offset, level + 1);
+ 		
+ 		if (panel_horizontal)
+ 			pos += child->width + a->paddingx;
diff --git a/community/tint2/fix_defunct_processes.patch b/community/tint2/zombie-fix.patch
index 28ea6c27a..48f767301 100644
--- a/community/tint2/fix_defunct_processes.patch
+++ b/community/tint2/zombie-fix.patch
@@ -4,10 +4,12 @@ Date: 18-05-2013
 Initial Package Version: subversion trunk (revision 652)
 Description: Fix zombie (defunct) processes created in clock_action.
 This patch provides the following bugfixes:
-   * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by tint2 (in particular by the clock -right or left- click). This is done by a small hack in the update_clocks_min, called to "redraw" that area.
+   * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by 
+tint2 (in particular by the clock -right or left- click). This is done by a small hack 
+in the update_clocks_min, called to "redraw" that area.
 
---- src/clock/clock.c	(revision 652)
-+++ src/clock/clock.c	(working copy)
+--- trunk/src/clock/clock.c	(revision 652)
++++ trunk/src/clock/clock.c	(working copy)
 @@ -23,6 +23,8 @@
  #include <cairo-xlib.h>
  #include <pango/pangocairo.h>
diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
new file mode 100644
index 000000000..f6d29de2c
--- /dev/null
+++ b/cross/cross-gcc/PKGBUILD
@@ -0,0 +1,278 @@
+# $Id: PKGBUILD 105446 2014-02-08 10:44:41Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Maintainer: Márcio Silva (Parabola) <coadde@parabola.nu>
+
+# toolchain build order:
+#  {kernel}-api-headers->glibc->binutils->gcc->binutils->glibc
+
+# toolchain (for cross-compiler) build order:
+#  {kernel}-api-headers(host system)->glibc(host system)
+# ->binutils(host system)->gcc(host system)->binutils(host system)->glibc(host system)
+# ->binutils(cross)->gcc(cross)
+# ->kernel-api-headers(target system)->glibc(target system)
+# ->binutils(target system)->gcc(target system)->binutils(target system)
+# ->glibc(target system)
+
+# NOTE: libtool requires rebuilt with each new gcc version
+
+#--------------------------------------------------------------------------------
+#  cross-compile table
+#--------------------------------------------------------------------------------
+
+# +-------------+-------------+-----------------------------------------------------------------------------------------------------+-----------+---------+
+# | -march      | CARCH       | CTARGET (_CTARGET)                                                                                  | Multilib  | QEMU    |
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+# | _march      | CARCH       | _arch       | <machine> | _os_target (GNU/*)                                                        | _multilib | -       |
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+# | mips64el    | mips64el    | mips64el    | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | opt       | bin/sys |
+# | mips64      | mips64      | mips64      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | opt       | bin/sys |
+# | *           | mipsel      | mipsel      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
+# | *           | mips        | mips        | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf                                 | no        | bin/sys |
+# | x86_64      | x86_64      | x86_64      | unknown   | gnu<|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | yes       | bin/sys |
+# | i[3-7]86    | i[3-7]86    | i[3-7]86    | pc        | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu      | no        | bin/sys |
+# | *           | i386        | i386        | unknown   | elf                                                                       | no        | bin/sys |
+# | armv8-a     | aarch64     | aarch64     | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf                    | yes       | -       |
+# | armv8-a     | aarch64_be  | aarch64_be  | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf                    | yes       | -       |
+# | armv7-a     | armv7h      | armv7l      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf              | no        | bin/sys |
+# | armv6       | armv6h      | armv6l      | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf              | no        | bin/sys |
+# | armv5te     | arm         | armv5tel    | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabi                    | no        | bin/sys |
+# | *           | arm         | arm         | unknown   | eabi                                                                      | no        | bin/sys |
+# | arm         | armeb       | armeb       | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnueabi|eabi                            | no        | bin     |
+# | sparc64     | sparc64     | sparc64     | unknown   | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu                        | opt       | bin/sys |
+# | sparc       | sparc       | sparc       | unknown   | {linux,kopenbsd,knetbsd,kopensolaris}-gnu                                 | no        | bin/sys |
+# | -           | ia64        | ia64        | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu                                     | yes       | -       |
+# | -           | s390        | s390        | ibm       | linux-gnu                                                                 | no        | -       |
+# | -           | s390x       | s390x       | ibm       | linux-gnu                                                                 | no        | bin/sys |
+#v| powerpc64   | powerpc64   | powerpc64   | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | opt       | bin/sys |x|eabi
+#x| powerpc64le | powerpc64le | powerpc64le | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | opt       | -       |
+# | powerpc     | powerpc     | powerpc     | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | bin/sys |
+# | powerpcle   | powerpcle   | powerpcle   | unknown   | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi}                   | no        | -       |
+# | -           | spu         | spu         | unknown   | elf                                                                       | no        | -       |
+# | -           | sh64        | sh64        | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | opt       | -       |
+# | -           | sh64le      | sh64le      | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | opt       | -       |
+# | -           | sh4         | sh4         | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
+# | -           | sh4le       | sh4le       | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | bin/sys |
+# | -           | sh          | sh          | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | - @     |
+# | -           | shle        | shle        | unknown   | {linux,kopenbsd,knetbsd}-gnu|elf                                          | no        | - @     |
+# | -           | xtensa      | xtensa      | unknown   | elf                                                                       | no        | sys     |
+# | *           | avr         | avr         | unknown   | elf                                                                       | no        | -       |
+# | *           | m68k        | m68k        | unknown   | gnu|{linux,kopenbsd,knetbsd}-gnu|elf                                      | no        | bin/sys |
+# | -           | lm32        | lm32        | unknown   | linux-gnu|elf                                                             | no        | sys     |
+# | -           | or32        | or32        | unknown   | linux-gnu<|elf<                                                           | no        | bin/sys |x|linux-gnu
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+
+# For "Wine"
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+#i| *           | x86_64      | x86_64      | unknown   | mingw64                                                                   | yes       | bin/sys |
+#i| *           | i[3-7]86    | i[3-7]86    | unknown   | mingw32                                                                   | no        | bin/sys |
+#?| *           | aarch64     | aarch64     | unknown   | ???                                                                       | yes       | -       |
+#?| *           | aarch64_be  | aarch64_be  | unknown   | ???                                                                       | yes       | -       |
+#?| *           | armv7h      | armv7l      | unknown   | ???                                                                       | no        | bin/sys |
+#?| *           | armv6h      | armv6l      | unknown   | ???                                                                       | no        | bin/sys |
+#?| *           | arm         | armv5tel    | unknown   | ???                                                                       | no        | bin/sys |
+#?| *           | armeb       | armeb       | unknown   | ???                                                                       | no        | bin     |
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+
+# For "DOSBox"
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+#i| *           | i386        | i386        | pc        | msdosdjgpp                                                                | no        | bin/sys |
+# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+
+
+# opt : Multilib is optional
+# * : Any supported by architecture.
+# - : None.
+# @ : bin/sys (Only sh4 and sh4l support)
+# < : experimental support. (future)
+
+#--------------------------------------------------------------------------------
+# options
+#--------------------------------------------------------------------------------
+
+# Hardware architecture:
+
+# options: "same", "mips64el", "x86_64", "i686" or "xtensa"
+_arch_target=mips64el
+
+# OS target:
+
+# system: <os> or <kernel>-<os>
+# options: "gnu", "linux-gnu", "kfreebsd-gnu" or "elf"
+_os_target=kfreebsd-gnu
+
+#--------------------------------------------------------------------------------
+# variables
+#--------------------------------------------------------------------------------
+
+# set the default values if it's not added
+[[ -z $_arch_target ]] && _arch_target=same
+[[ -z $_os_target ]] && _os_target=linux-gnu
+
+# set the value on _arch variable 
+if [[ $_arch_target == same ]]; then
+  _arch=$CARCH
+else
+  _arch=$_arch_target
+fi
+
+# set the value on _target variable
+if [[ $_arch == i686 ]]; then
+  _target=$_arch-pc-$_os_target
+else
+  _target=$_arch-unknown-$_os_target
+fi
+
+#--------------------------------------------------------------------------------
+
+_pkgname=gcc
+pkgname=$_target-$_pkgname
+makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'doxygen')
+pkgver=4.8.2
+_pkgver=4.8
+pkgrel=8
+_snapshot=4.8-20140206
+pkgdesc="The GNU Compiler Collection"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://$_pkgname.gnu.org"
+checkdepends=('dejagnu' 'inetutils')
+options=('!emptydirs')
+source=(#ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2
+        ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2
+        $_pkgname-4.8-filename-output.patch
+        $_pkgname-4.8-lambda-ICE.patch
+        $_pkgname-xtensa.patch)
+md5sums=('9d35549404a2326540fb88301ebd1977'
+         '40cb437805e2f7a006aa0d0c3098ab0f'
+         '6eb6e080dbf7bc6825f53a0aaa6c4ef9'
+         '81372ee980289a9f6df01dad31c64a63')
+
+if [ -n "${_snapshot}" ]; then
+  _basedir=$_pkgname-${_snapshot}
+else
+  _basedir=$_pkgname-${pkgver}
+fi
+
+_libdir="usr/lib/$_pkgname/$_target/$pkgver"
+
+prepare() {
+  cd ${srcdir}/${_basedir}
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' $_pkgname/Makefile.in
+
+  # Parabola installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' $_pkgname/config/i386/t-linux64
+
+  echo ${pkgver} > $_pkgname/BASE-VER
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,$_pkgname}/configure
+
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
+  patch -p0 -i ${srcdir}/$_pkgname-4.8-filename-output.patch
+  
+  # http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279
+  patch -p1 -i ${srcdir}/$_pkgname-4.8-lambda-ICE.patch
+
+  # installing libiberty headers is broken
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56780#c6
+  sed -i 's#@target_header_dir@#libiberty#' libiberty/Makefile.in
+
+  # open-ath9k-htc-firmware patch on xtensa-unknown-elf
+  [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch
+
+  mkdir ${srcdir}/$_pkgname-build
+}
+
+build() {
+  cd ${srcdir}/$_pkgname-build
+
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
+  ${srcdir}/${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-languages=c,c++,lto --disable-static \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --disable-libssp \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --enable-cloog-backend=isl --disable-cloog-version-check \
+      --enable-lto --enable-plugin --enable-install-libiberty \
+      --with-linker-hash-style=gnu \
+      --disable-multilib --disable-werror \
+      --enable-checking=release --target=$_target --program-prefix=$_target-
+  make all-$_pkgname
+}
+
+package() {
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("$_target-binutils>=2.24" 'libmpc' 'cloog')
+  groups=('cross-devel')
+  provides=("$_pkgname=$pkgver-$pkgrel")
+  conflicts=("$_pkgname" "$_pkgname-ada" "$_pkgname-fortran" "$_pkgname-go" "$_pkgname-objc")
+  install=$_pkgname.install
+
+  cd ${srcdir}/$_pkgname-build
+
+  make -C $_pkgname DESTDIR=${pkgdir} install-driver install-cpp install-$_pkgname-ar \
+    c++.install-common install-headers install-plugin install-lto-wrapper
+
+  install -m755 $_pkgname/gcov $pkgdir/usr/bin/
+  install -m755 -t $pkgdir/${_libdir}/ $_pkgname/{cc1,cc1plus,collect2,lto1}
+
+  make DESTDIR=${pkgdir} install-fixincludes
+  make -C $_pkgname DESTDIR=${pkgdir} install-mkheaders
+  make -C lto-plugin DESTDIR=${pkgdir} install
+
+  make -C libiberty DESTDIR=${pkgdir} install
+
+  make -C $_pkgname DESTDIR=${pkgdir} install-man install-info
+
+  make -C libcpp DESTDIR=${pkgdir} install
+  make -C $_pkgname DESTDIR=${pkgdir} install-po
+
+  # many packages expect this symlinks
+  ln -s $_pkgname ${pkgdir}/usr/bin/cc
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # link files
+  for bin2 in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib; do
+    ln -s $_target-$bin2 $pkgdir/usr/bin/$bin2; done
+  for man in $(ls -1 $pkgdir/usr/share/man/man1); do
+    ln -s $man $pkgdir/usr/share/man/man1/${man#$_target-}; done
+}
diff --git a/cross/cross-gcc/gcc-4.8-filename-output.patch b/cross/cross-gcc/gcc-4.8-filename-output.patch
new file mode 100644
index 000000000..6951eb239
--- /dev/null
+++ b/cross/cross-gcc/gcc-4.8-filename-output.patch
@@ -0,0 +1,17 @@
+--- gcc/c-family/c-opts.c       (revision 200330)
++++ gcc/c-family/c-opts.c       (working copy)
+@@ -1338,10 +1338,14 @@ c_finish_options (void)
+
+ /* Give CPP the next file given by -include, if any.  */
+ static void
+ push_command_line_include (void)
+ {
++  // This can happen if disabled by -imacros for example.
++  if (include_cursor > deferred_count)
++    return;
++
+   if (!done_preinclude)
+     {
+       done_preinclude = true;
+       if (flag_hosted && std_inc && !cpp_opts->preprocessed)
+        {
diff --git a/cross/cross-gcc/gcc-4.8-lambda-ICE.patch b/cross/cross-gcc/gcc-4.8-lambda-ICE.patch
new file mode 100644
index 000000000..cf77a9b35
--- /dev/null
+++ b/cross/cross-gcc/gcc-4.8-lambda-ICE.patch
@@ -0,0 +1,35 @@
+diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
+index 0b8e2f7..ad1c209 100644
+--- a/gcc/cp/semantics.c
++++ b/gcc/cp/semantics.c
+@@ -2719,8 +2719,10 @@ finish_member_declaration (tree decl)
+ 					      /*friend_p=*/0);
+ 	}
+     }
+-  /* Enter the DECL into the scope of the class.  */
+-  else if (pushdecl_class_level (decl))
++  /* Enter the DECL into the scope of the class, if the class
++     isn't a closure (whose fields are supposed to be unnamed).  */
++  else if (CLASSTYPE_LAMBDA_EXPR (current_class_type)
++	   || pushdecl_class_level (decl))
+     {
+       if (TREE_CODE (decl) == USING_DECL)
+ 	{
+diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
+new file mode 100644
+index 0000000..df2b037
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
+@@ -0,0 +1,9 @@
++// PR c++/56710
++// { dg-options "-std=c++11 -Wall" }
++
++int main()
++{
++    int t = 0;
++    return [&]() -> int {int __t; __t = t; return __t; }();
++    return [&t]() -> int {int __t; __t = t; return __t; }();
++}
+-- 
+1.8.4.2
+
diff --git a/cross/cross-gcc/gcc-xtensa.patch b/cross/cross-gcc/gcc-xtensa.patch
new file mode 100644
index 000000000..9f43902be
--- /dev/null
+++ b/cross/cross-gcc/gcc-xtensa.patch
@@ -0,0 +1,115 @@
+From c7162b8a3db42e7faf47606d3aa3dd61e64aea17 Mon Sep 17 00:00:00 2001
+From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+Date: Mon, 7 Jan 2013 16:06:28 +0530
+Subject: [PATCH] gcc: AR9271/AR7010 config
+
+Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+---
+ include/xtensa-config.h | 36 +++++++++++++++++-------------------
+ 1 file changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/include/xtensa-config.h b/include/xtensa-config.h
+index 30f4f41..fe9b051 100644
+--- a/include/xtensa-config.h
++++ b/include/xtensa-config.h
+@@ -1,7 +1,7 @@
+ /* Xtensa configuration settings.
+-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
++   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+-   Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.
++   Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -44,10 +44,7 @@
+ #define XCHAL_HAVE_L32R			1
+ 
+ #undef XSHAL_USE_ABSOLUTE_LITERALS
+-#define XSHAL_USE_ABSOLUTE_LITERALS	0
+-
+-#undef XSHAL_HAVE_TEXT_SECTION_LITERALS
+-#define XSHAL_HAVE_TEXT_SECTION_LITERALS 1 /* Set if there is some memory that allows both code and literals.  */
++#define XSHAL_USE_ABSOLUTE_LITERALS	1
+ 
+ #undef XCHAL_HAVE_MAC16
+ #define XCHAL_HAVE_MAC16		0
+@@ -59,10 +56,10 @@
+ #define XCHAL_HAVE_MUL32		1
+ 
+ #undef XCHAL_HAVE_MUL32_HIGH
+-#define XCHAL_HAVE_MUL32_HIGH		0
++#define XCHAL_HAVE_MUL32_HIGH		1
+ 
+ #undef XCHAL_HAVE_DIV32
+-#define XCHAL_HAVE_DIV32		1
++#define XCHAL_HAVE_DIV32		0
+ 
+ #undef XCHAL_HAVE_NSA
+ #define XCHAL_HAVE_NSA			1
+@@ -103,8 +100,6 @@
+ #undef XCHAL_HAVE_FP_RSQRT
+ #define XCHAL_HAVE_FP_RSQRT		0
+ 
+-#undef XCHAL_HAVE_DFP_accel
+-#define XCHAL_HAVE_DFP_accel			0
+ #undef XCHAL_HAVE_WINDOWED
+ #define XCHAL_HAVE_WINDOWED		1
+ 
+@@ -119,32 +114,32 @@
+ 
+ 
+ #undef XCHAL_ICACHE_SIZE
+-#define XCHAL_ICACHE_SIZE		16384
++#define XCHAL_ICACHE_SIZE		0
+ 
+ #undef XCHAL_DCACHE_SIZE
+-#define XCHAL_DCACHE_SIZE		16384
++#define XCHAL_DCACHE_SIZE		0
+ 
+ #undef XCHAL_ICACHE_LINESIZE
+-#define XCHAL_ICACHE_LINESIZE		32
++#define XCHAL_ICACHE_LINESIZE		16
+ 
+ #undef XCHAL_DCACHE_LINESIZE
+-#define XCHAL_DCACHE_LINESIZE		32
++#define XCHAL_DCACHE_LINESIZE		16
+ 
+ #undef XCHAL_ICACHE_LINEWIDTH
+-#define XCHAL_ICACHE_LINEWIDTH		5
++#define XCHAL_ICACHE_LINEWIDTH		4
+ 
+ #undef XCHAL_DCACHE_LINEWIDTH
+-#define XCHAL_DCACHE_LINEWIDTH		5
++#define XCHAL_DCACHE_LINEWIDTH		4
+ 
+ #undef XCHAL_DCACHE_IS_WRITEBACK
+-#define XCHAL_DCACHE_IS_WRITEBACK	1
++#define XCHAL_DCACHE_IS_WRITEBACK	0
+ 
+ 
+ #undef XCHAL_HAVE_MMU
+ #define XCHAL_HAVE_MMU			1
+ 
+ #undef XCHAL_MMU_MIN_PTE_PAGE_SIZE
+-#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	12
++#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	29
+ 
+ 
+ #undef XCHAL_HAVE_DEBUG
+@@ -157,8 +152,11 @@
+ #define XCHAL_NUM_DBREAK		2
+ 
+ #undef XCHAL_DEBUGLEVEL
+-#define XCHAL_DEBUGLEVEL		6
++#define XCHAL_DEBUGLEVEL		4
++
+ 
++#undef XCHAL_EXCM_LEVEL
++#define XCHAL_EXCM_LEVEL                3
+ 
+ #undef XCHAL_MAX_INSTRUCTION_SIZE
+ #define XCHAL_MAX_INSTRUCTION_SIZE	3
+-- 
+1.8.1
+
diff --git a/cross/cross-gcc/gcc.install b/cross/cross-gcc/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/cross/cross-gcc/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
new file mode 100644
index 000000000..2747c6975
--- /dev/null
+++ b/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
@@ -0,0 +1,43 @@
+From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 14 Feb 2014 20:27:20 +0000
+Subject: docs: fix mismatched para tags
+
+newer gtkdoc is more sensitive to mismatched docbook tags.
+This fixes the build in master.
+---
+diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
+index 549a9d2..e278886 100644
+--- a/gst/audiofx/audiocheblimit.c
++++ b/gst/audiofx/audiocheblimit.c
+@@ -46,12 +46,12 @@
+  * be at most this value. A lower ripple value will allow a faster rolloff.
+  *
+  * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
+- * </para>
++ *
+  * <note><para>
+  * Be warned that a too large number of poles can produce noise. The most poles are possible with
+  * a cutoff frequency at a quarter of the sampling rate.
+  * </para></note>
+- * <para>
++ *
+  * <refsect2>
+  * <title>Example launch line</title>
+  * |[
+diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
+index 922e381..ea49af9 100644
+--- a/gst/udp/gstudpsrc.c
++++ b/gst/udp/gstudpsrc.c
+@@ -78,8 +78,7 @@
+  * </itemizedlist>
+  * The message is typically used to detect that no UDP arrives in the receiver
+  * because it is blocked by a firewall.
+- * </para>
+- * <para>
++ *
+  * A custom file descriptor can be configured with the
+  * #GstUDPSrc:sockfd property. The socket will be closed when setting the
+  * element to READY by default. This behaviour can be
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
new file mode 100644
index 000000000..e4d2fef81
--- /dev/null
+++ b/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
@@ -0,0 +1,75 @@
+From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 18 Feb 2014 21:54:45 +0000
+Subject: docs: use docbook markup for xi:include
+
+It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
+CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
+the only 4, we're fixing them instead.
+---
+diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
+index e0887ad..0ab32f3 100644
+--- a/gst/audiofx/audiofirfilter.c
++++ b/gst/audiofx/audiofirfilter.c
+@@ -39,9 +39,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
+index c107594..eb4f20c 100644
+--- a/gst/audiofx/audioiirfilter.c
++++ b/gst/audiofx/audioiirfilter.c
+@@ -35,9 +35,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
+index 59943d4..5cd83c8 100644
+--- a/gst/level/gstlevel.c
++++ b/gst/level/gstlevel.c
+@@ -95,9 +95,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
+index 75a9152..5e192c1 100644
+--- a/gst/spectrum/gstspectrum.c
++++ b/gst/spectrum/gstspectrum.c
+@@ -90,9 +90,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  *
+  * Last reviewed on 2011-03-10 (0.10.29)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 494ea252b..a6350f1a7 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205816 2014-02-10 13:12:32Z heftig $
+# $Id: PKGBUILD 207962 2014-03-15 19:47:26Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -11,8 +11,20 @@ url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc')
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470')
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
+        0001-docs-fix-mismatched-para-tags.patch
+        0002-docs-use-docbook-markup-for-xi-include.patch)
+sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470'
+            'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64'
+            '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix build with gtk-doc 1.20 FS#39454
+  patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch
+  patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch
new file mode 100644
index 000000000..2747c6975
--- /dev/null
+++ b/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch
@@ -0,0 +1,43 @@
+From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 14 Feb 2014 20:27:20 +0000
+Subject: docs: fix mismatched para tags
+
+newer gtkdoc is more sensitive to mismatched docbook tags.
+This fixes the build in master.
+---
+diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
+index 549a9d2..e278886 100644
+--- a/gst/audiofx/audiocheblimit.c
++++ b/gst/audiofx/audiocheblimit.c
+@@ -46,12 +46,12 @@
+  * be at most this value. A lower ripple value will allow a faster rolloff.
+  *
+  * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
+- * </para>
++ *
+  * <note><para>
+  * Be warned that a too large number of poles can produce noise. The most poles are possible with
+  * a cutoff frequency at a quarter of the sampling rate.
+  * </para></note>
+- * <para>
++ *
+  * <refsect2>
+  * <title>Example launch line</title>
+  * |[
+diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
+index 922e381..ea49af9 100644
+--- a/gst/udp/gstudpsrc.c
++++ b/gst/udp/gstudpsrc.c
+@@ -78,8 +78,7 @@
+  * </itemizedlist>
+  * The message is typically used to detect that no UDP arrives in the receiver
+  * because it is blocked by a firewall.
+- * </para>
+- * <para>
++ *
+  * A custom file descriptor can be configured with the
+  * #GstUDPSrc:sockfd property. The socket will be closed when setting the
+  * element to READY by default. This behaviour can be
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch
new file mode 100644
index 000000000..e4d2fef81
--- /dev/null
+++ b/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch
@@ -0,0 +1,75 @@
+From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 18 Feb 2014 21:54:45 +0000
+Subject: docs: use docbook markup for xi:include
+
+It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
+CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
+the only 4, we're fixing them instead.
+---
+diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
+index e0887ad..0ab32f3 100644
+--- a/gst/audiofx/audiofirfilter.c
++++ b/gst/audiofx/audiofirfilter.c
+@@ -39,9 +39,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
+index c107594..eb4f20c 100644
+--- a/gst/audiofx/audioiirfilter.c
++++ b/gst/audiofx/audioiirfilter.c
+@@ -35,9 +35,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
+index 59943d4..5cd83c8 100644
+--- a/gst/level/gstlevel.c
++++ b/gst/level/gstlevel.c
+@@ -95,9 +95,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
+index 75a9152..5e192c1 100644
+--- a/gst/spectrum/gstspectrum.c
++++ b/gst/spectrum/gstspectrum.c
+@@ -90,9 +90,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  *
+  * Last reviewed on 2011-03-10 (0.10.29)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index d016c212e..08490a1a0 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 201392 2013-12-10 15:08:37Z jgc $
+# $Id: PKGBUILD 207963 2014-03-15 19:48:48Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo')
 url="http://gstreamer.freedesktop.org/"
 options=(!emptydirs)
 source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9"
-        test-rtp-payloading.patch)
+        test-rtp-payloading.patch
+        0001-docs-fix-mismatched-para-tags.patch
+        0002-docs-use-docbook-markup-for-xi-include.patch)
 sha256sums=('SKIP'
-            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29')
+            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29'
+            'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64'
+            '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7')
 
 prepare() {
   cd gst-plugins-good
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-  patch -Np1 -i ../test-rtp-payloading.patch
+
+  patch -p1 -i ../test-rtp-payloading.patch
+
+  # Fix build with gtk-doc 1.20 FS#39454
+  patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch
+  patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch
 }
 
 build() {
diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
index 11c05cbf0..5f1ddad9d 100644
--- a/extra/libmbim/PKGBUILD
+++ b/extra/libmbim/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205456 2014-02-05 15:22:56Z heftig $
+# $Id: PKGBUILD 207965 2014-03-15 21:06:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libmbim
-pkgver=1.6.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="MBIM modem protocol helper library"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=(GPL2)
 depends=(glib2 bash systemd)
 makedepends=(gtk-doc python)
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e0efbdaf2aeddec033b4c7c5d0f7934c91ce535c5c9f0cadf1e67527d10ab082')
+sha256sums=('084b527ea88f7e1e31a6208840036aecede21fcd0668332523c81a2ebe2d9ea6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index cb8b33ef7..5cc8a33ee 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205850 2014-02-11 18:23:07Z andyrtr $
+# $Id: PKGBUILD 207945 2014-03-15 10:03:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
-pkgbase=libreoffice
+pkgbase="libreoffice"
 pkgname=('libreoffice-common'
 	'libreoffice-base'
 	'libreoffice-calc'
@@ -16,11 +16,10 @@ pkgname=('libreoffice-common'
 	'libreoffice-writer'
 	'libreoffice-en-US'
 	'libreoffice-postgresql-connector'
-	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.5.3
-pkgver=4.1.5
+_LOver=4.2.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -28,15 +27,17 @@ url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
-             'clucene' 'bluez-libs' 'harfbuzz-icu'
+             'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1"
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4'
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
+             'libvisio' 'libetonyek' 'libodfgen'  'telepathy-glib'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
+	         'ttf-liberation' # to satisfy regression tests
+	         'git')
 # there's only one single static library in libreoffice-sdk,
 # the next build that removes it may lead to trouble if people may use it
 # -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
@@ -50,11 +51,10 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_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}/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}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@@ -71,30 +71,32 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_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}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
-	${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+	${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
+	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 	${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libmwaw-0.1.11.tar.bz2
-	${_additional_source_url}/libvisio-0.0.31.tar.bz2
+	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
+	${_additional_source_url}/libatomic_ops-7_2d.zip
+	${_additional_source_url}/libe-book-0.0.3.tar.bz2
+	${_additional_source_url}/libabw-0.0.2.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
+	47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.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
 	625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@@ -115,22 +117,24 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
-	libmwaw-0.1.11.tar.bz2
-	libvisio-0.0.31.tar.bz2	)
-md5sums=('12679026121300396c85b4ca11b176c7'
+	libmwaw-0.2.0.tar.bz2
+	libfreehand-0.0.0.tar.bz2
+	Firebird-2.5.2.26540-0.tar.bz2
+	libatomic_ops-7_2d.zip
+	libe-book-0.0.3.tar.bz2
+	libabw-0.0.2.tar.bz2)
+md5sums=('b8b00aac99c056e8908c1a89ad999f4b'
          'SKIP'
-         'e0ea06a105071c278e52866f476c0ee6'
+         '3c11900dce8a5e520abc8350045b2407'
          'SKIP'
-         'c3b03c33ee14628f1c151288f2eb4962'
+         '5ac66bd46617d00f759602c00e755ea0'
          'SKIP'
-         'f02578f5218f217a9f20e9c30e119c6a'
+         '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
-         '2a177023f9ea8ec8bd00837605c5df1b'
          'a7983f859eafb2677d7ff386a023bc40'
          '3c219630e4302863a9a83d0efde889db'
          '625ff5f2f968dd908bca43c9469d6e6b'
@@ -147,19 +151,22 @@ md5sums=('12679026121300396c85b4ca11b176c7'
          'ace6ab49184e329db254e454a010f56d'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
-         '08c85a6d6d793daee14e10e22eefdc4b'
-         'dc3d21a3921931096d6e80f6701f6763'
-         'b2371dc7cf4811c9d32146eec913d296'
+         '47203e7cade74e5c385aa812f21e7932'
+         'ae330b9493bd4503ac390106ff6060d7'
+         '22f8a85daf4a012180322e1f52a7563b'
          'ea2acaf140ae40a87a952caa75184f4d'
          '36271d3fa0d9dec1632029b6d7aac925'
          '0168229624cfac409e766913506961a8'
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
-         '8473296c671b6e3dd8197f4145e0854b'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
-         '828dd03510791fbe037081a2b4a1a8ff'
-         '82628333418f101a20cd21f980cf9f40'
+         'd794625f156a9fb1c53b3f8a8aa13b5e'
+         '496dd00028afcc19f896b01394769043'
+         '21154d2004e025c8a3666625b0357bb5'
+         'c0b86562d5aa40761a87134f83e6adcf'
+         '2f1ceaf2ac8752ed278e175447d9b978'
+         '40fa48e03b1e28ae0325cc34b35bc46d'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -167,7 +174,7 @@ md5sums=('12679026121300396c85b4ca11b176c7'
 prepare() {
 
     cd libreoffice-$_LOver
-
+#return 1
     # fix exttextcat build error
     # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
     unset CPPFLAGS
@@ -179,6 +186,11 @@ prepare() {
 	done
 	popd
 
+    # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+    # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+    rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+    cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
+
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
 
@@ -215,6 +227,7 @@ build() {
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
 		--enable-crashdump \
+		--enable-avahi \
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
@@ -224,11 +237,15 @@ build() {
 		--enable-gtk3 \
 		--enable-gstreamer \
 		--enable-lockdown\
+		--enable-opencl \
 		--enable-opengl \
+		--enable-openssl \
 		--enable-odk\
+		--enable-orcus \
 		--enable-python=system \
 		--enable-scripting-beanshell \
 		--enable-scripting-javascript \
+		--enable-telepathy \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--without-fonts\
@@ -237,7 +254,7 @@ build() {
 		--without-system-libcdr \
 		--without-system-mdds\
 		--without-myspell-dicts \
-		--without-system-libvisio \
+		--with-system-libvisio \
 		--without-system-libcmis \
 		--without-system-libmspub \
 		--without-system-libexttextcat \
@@ -245,8 +262,14 @@ build() {
 		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
-		--without-system-libodfgen \
+		--with-system-libodfgen \
 		--without-system-libmwaw \
+		--with-system-libetonyek \
+		--without-system-libfreehand \
+		--without-system-firebird \
+		--without-system-libatomic-ops \
+		--without-system-libebook \
+		--without-system-libabw \
 		--with-system-dicts \
 		--with-external-dict-dir=/usr/share/hunspell \
 		--with-external-hyph-dir=/usr/share/hyphen \
@@ -266,13 +289,11 @@ build() {
 		--with-system-headers\
 		--without-system-hsqldb \
 		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api \
-		--enable-hardlink-deliver \
-		--disable-dependency-tracking
-
-#		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
+		--with-system-clucene \
+		--disable-dependency-tracking \
+		--enable-hardlink-deliver #--help
 
+#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
 #		--without-ppds\ # breaks spadmin permission
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -295,20 +316,21 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.4"
-          'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
+          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
+             'beanshell2:       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 and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
+             'gtk2:             for browser plugin'
+             'libpaper:         takes care of papersize')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf
@@ -321,7 +343,7 @@ package_libreoffice-common() {
  conflicts=('go-openoffice')
  replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
            'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
+           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
 
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
@@ -362,6 +384,9 @@ package_libreoffice-common() {
 
  # workaround all packages now depend on that file
  cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 
  # add missing files from Beanshell provider
  # create directories from *list.txt file
@@ -427,7 +452,7 @@ package_libreoffice-postgresql-connector() {
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
+ depends=('libreoffice-common' 'lpsolve')
  #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -444,6 +469,9 @@ package_libreoffice-calc() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 }
 
 package_libreoffice-draw() {
@@ -491,7 +519,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
- depends=('libreoffice-common')
+ depends=('libreoffice-common' 'libetonyek')
  optdepends=('glu:             for the OGLTrans extension')
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -632,7 +660,7 @@ package_libreoffice-writer() {
  done
 
  # for workaround this file belongs now to common
- rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-en-US() {
@@ -656,16 +684,6 @@ package_libreoffice-en-US() {
  done
 }
 
-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}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
 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"
@@ -674,7 +692,7 @@ package_libreoffice-extension-wiki-publisher() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
 }
 
 package_libreoffice-extension-nlpsolver() {
@@ -685,5 +703,5 @@ package_libreoffice-extension-nlpsolver() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }
diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42
deleted file mode 100644
index b36102903..000000000
--- a/extra/libreoffice/PKGBUILD.42
+++ /dev/null
@@ -1,698 +0,0 @@
-# $Id: PKGBUILD 202438 2013-12-21 21:14:43Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-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-postgresql-connector'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.0.4
-pkgver=4.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
-             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
-             'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
-             'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
-             'libvisio' 'libetonyek' 'libodfgen'  'telepathy-glib'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-liberation' # to satisfy regression tests 
-	         'git')
-# there's only one single static library in libreoffice-sdk,
-# the next build that removes it may lead to trouble if people may use it
-# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
-# options=('staticlibs') 
-
-# 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"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_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}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-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}/01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
-	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
-	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libcdr-0.0.14.tar.bz2
-	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
-	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
-	${_additional_source_url}/libatomic_ops-7_2d.zip
-	${_additional_source_url}/libe-book-0.0.2.tar.bz2
-	${_additional_source_url}/libabw-0.0.1.tar.bz2
-	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-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
-	ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
-	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libcdr-0.0.14.tar.bz2
-	libmspub-0.0.6.tar.bz2
-	libmwaw-0.2.0.tar.bz2
-	libfreehand-0.0.0.tar.bz2
-	Firebird-2.5.2.26540-0.tar.bz2
-	libatomic_ops-7_2d.zip
-	libe-book-0.0.2.tar.bz2
-	libabw-0.0.1.tar.bz2)
-md5sums=('98674d57d6dd24baef38f007b5020e8e'
-         '8554bbbdfc72db998a191c71eeafdb55'
-         '4873b18cd8a535814777c8630fe2db9f'
-         '15cb8c0803064faef0c4ddf5bc5ca279'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '625ff5f2f968dd908bca43c9469d6e6b'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '2e482c7567908d334785ce7d69ddfff7'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '01a380acfec23bf617117ce98e318f3d'
-         'ae330b9493bd4503ac390106ff6060d7'
-         '22f8a85daf4a012180322e1f52a7563b'
-         'ea2acaf140ae40a87a952caa75184f4d'
-         '36271d3fa0d9dec1632029b6d7aac925'
-         '0168229624cfac409e766913506961a8'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '185d60944ea767075d27247c3162b3bc'
-         'd88f9b94df880d2c05be943b000ca112'
-         '1120705cd0f0d9bd5506360bf57b6c2e'
-         'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '496dd00028afcc19f896b01394769043'
-         '21154d2004e025c8a3666625b0357bb5'
-         'c0b86562d5aa40761a87134f83e6adcf'
-         '3a62e10c57270718cabfdfc4b7b4e095'
-         'af3ccc1f1884e68389088d490d596409'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
-
-prepare() {
-
-    cd libreoffice-$_LOver
-#return 1
-    # fix exttextcat build error
-    # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
-    unset CPPFLAGS
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-    # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
-    # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
-   
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#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
-
-
-    # qt4 fix
-    sed -i "s:qmake:qmake-qt4:g" configure.ac
-}
-
-build() {
-    cd libreoffice-$_LOver
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-
-	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-		--enable-split-app-modules \
-		--with-parallelism=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--disable-verbose \
-		--enable-release-build \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-avahi \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-gstreamer \
-		--enable-lockdown\
-		--enable-opencl \
-		--enable-opengl \
-		--enable-openssl \
-		--enable-odk\
-		--enable-orcus \
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--enable-telepathy \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--without-fonts\
-		--without-afms\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libmspub \
-		--without-system-libexttextcat \
-		--without-system-orcus \
-		--without-system-liblangtag \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-libodfgen \
-		--without-system-libmwaw \
-		--with-system-libetonyek \
-		--without-system-libfreehand \
-		--without-system-firebird \
-		--without-system-libatomic-ops \
-		--without-system-libebook \
-		--without-system-libabw \
-		--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-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-npapi-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--without-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene \
-		--disable-dependency-tracking \
-		--enable-hardlink-deliver #--help
-		
-#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
-#		--without-ppds\ # breaks spadmin permission
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#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=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell2:       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 and for MS visual import'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin'
-             'libpaper:         takes care of papersize')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf
-         etc/profile.d/libreoffice-common.sh
-         etc/profile.d/libreoffice-common.csh)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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
- 
- # 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/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/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
-  
- # workaround all packages now depend on that file
- cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- 
- # add missing files from Beanshell provider
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; 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 || /bin/true # some double file entries make it fail
- done
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common')
- optdepends=('libreoffice-postgresql-connector')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_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."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' 'telepathy-glib')
- #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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' 'gconf')
- optdepends=('gtk3: for gtk3 Gnome integration'
-             'gtk2: for older gtk2 desktop integration')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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."
- install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
- optdepends=('glu:             for the OGLTrans extension')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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}/libreoffice-$_LOver/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/libreoffice-$_LOver/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
- 
- # one file (libkde4be1lo.so) is part of kde_list.txt
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_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 Application for LibreOffice."
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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 environment path to keep compatibility with other java-environments
-#  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/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/libreoffice-$_LOver/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
- 
- # for workaround this file belongs now to common
- rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
-}
-
-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}/libreoffice-$_LOver/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/libreoffice-$_LOver/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-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-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-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-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 5d48b4865..2bab10435 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 207418 2014-03-08 18:51:10Z lcarlier $
+# $Id: PKGBUILD 207954 2014-03-15 14:36:28Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.1.0
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -121,13 +121,11 @@ package_mesa() {
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
 
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
-  # rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv ${pkgdir}/usr/lib/libGL.so.1.2.0 		${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
-  mv ${pkgdir}/usr/lib/libEGL.so.1.0.0 		${pkgdir}/usr/lib/mesa-libEGL.so.1.0.0
-  mv ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 	${pkgdir}/usr/lib/mesa-libGLESv1_CM.so.1.1.0
-  mv ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 	${pkgdir}/usr/lib/mesa-libGLESv2.so.2.0.0
-
-  rm ${pkgdir}/usr/lib/lib{GL,EGL,GLESv1_CM,GLESv2}.so*
+  install -m755 -d ${pkgdir}/usr/lib/mesa
+  # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+  mv -v ${pkgdir}/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${pkgdir}/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${pkgdir}/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@@ -143,18 +141,21 @@ package_mesa-libgl() {
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
-  ln -s mesa-libGL.so.1.2.0 	    ${pkgdir}/usr/lib/libGL.so
-  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/libGL.so.1.2.0
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so.1
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so.1.0.0
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so.1
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so.2
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+  ln -s libGL.so.1.2.0	             ${pkgdir}/usr/lib/libGL.so.1
+  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so
+
+  ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+  ln -s libEGL.so.1.0.0	              ${pkgdir}/usr/lib/libEGL.so.1
+  ln -s libEGL.so.1.0.0               ${pkgdir}/usr/lib/libEGL.so
+
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+  ln -s libGLESv1_CM.so.1.1.0	            ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1.1.0               ${pkgdir}/usr/lib/libGLESv1_CM.so
+
+  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so.2
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
diff --git a/libre-multilib/wine-libre/30-win32-aliases.conf b/libre-multilib/wine-libre/30-win32-aliases.conf
deleted file mode 100644
index 99ae1f7b8..000000000
--- a/libre-multilib/wine-libre/30-win32-aliases.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias binding="same">
-    <family>MS Shell Dlg</family>
-    <accept><family>Microsoft Sans Serif</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-  <alias binding="same">
-    <family>MS Shell Dlg 2</family>
-    <accept><family>Tahoma</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-
-  <alias binding="same">
-    <family>MS Sans Serif</family>
-    <prefer><family>Microsoft Sans Serif</family></prefer>
-    <default><family>sans-serif</family></default>
-  </alias>
-</fontconfig>
diff --git a/libre-multilib/wine-libre/PKGBUILD b/libre-multilib/wine-libre/PKGBUILD
deleted file mode 100644
index 3aa5bb54a..000000000
--- a/libre-multilib/wine-libre/PKGBUILD
+++ /dev/null
@@ -1,182 +0,0 @@
-# $Id: PKGBUILD 106809 2014-03-08 10:44:24Z bluewind $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=wine
-pkgname=wine-libre
-pkgver=1.7.14
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$_pkgbasever.tar.bz2{,.sign}
-        30-win32-aliases.conf)
-md5sums=('75195349b18f6d4d9ec56b9cfa915160'
-         'SKIP'
-         '1ff4e467f59409272088d92173a0f801')
-
-pkgdesc="A compatibility layer for running Windows programs, with mesa-libcl support"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-options=(staticlibs)
-license=(LGPL)
-install=wine.install
-provides=$_pkgname=$pkgver
-conflicts=$_pkgname
-replaces=$_pkgname
-
-_depends=(
-  fontconfig      lib32-fontconfig
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  freetype2       lib32-freetype2
-  glu             lib32-glu
-  libsm           lib32-libsm
-  gcc-libs        lib32-gcc-libs
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  gnutls          lib32-gnutls
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libxml2         lib32-libxml2
-  libldap         lib32-libldap
-  lcms2           lib32-lcms2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  libxcomposite   lib32-libxcomposite
-  mesa            lib32-mesa
-  mesa-libgl      lib32-mesa-libgl
-  mesa-libcl      lib32-mesa-libcl
-  samba
-  opencl-headers
-)
-  
-optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  gnutls          lib32-gnutls
-  lcms2           lib32-lcms2
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  libjpeg-turbo   lib32-libjpeg-turbo
-  libxcomposite   lib32-libxcomposite
-  libxinerama     lib32-libxinerama
-  ncurses         lib32-ncurses
-  mesa-libcl      lib32-mesa-libcl
-  cups
-  samba           dosbox
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  _depends=(${_depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  makedepends=(${makedepends[@]} ${_depends[@]})
-  provides+=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts+=('bin32-wine' 'wine-wow64')
-  replaces+=('bin32-wine')
-fi
-
-depends=(${_depends[@]})
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $_pkgname-$_pkgbasever $_pkgname
-
-  # ncurses fix
-  sed -i 's|libncurses|libncursesw|g' "$srcdir/$_pkgname/configure"
-  sed -i 's|lncurses|lncursesw|g' "$srcdir/$_pkgname/configure"
-
-  # Get rid of old build dirs
-  rm -rf $_pkgname-{32,64}-build
-  mkdir $_pkgname-32-build
-
-  # These additional CPPFLAGS solve FS#27662 and FS#34195
-  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $_pkgname-64-build
-    cd "$srcdir/$_pkgname-64-build"
-    ../$_pkgname/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --with-x \
-      --without-gstreamer \
-      --enable-win64
-    # Gstreamer was disabled for FS#33655
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$_pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$_pkgname-32-build"
-  ../$_pkgname/configure \
-    --prefix=/usr \
-    --with-x \
-    --without-gstreamer \
-    "${_wine32opts[@]}"
-
-  # These additional flags solve FS#23277
-  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$_pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$_pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-
-  # Font aliasing settings for Win32 applications
-  install -d "$pkgdir"/etc/fonts/conf.{avail,d}
-  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
-  ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/libre-multilib/wine-libre/wine.install b/libre-multilib/wine-libre/wine.install
deleted file mode 100644
index 21dda162b..000000000
--- a/libre-multilib/wine-libre/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Parabola wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index 47ea86d07..298d52ee1 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -2,26 +2,31 @@
 
 _pkgname=debootstrap
 pkgname=debootstrap-libre
-pkgver=1.0.53
-pkgrel=3.1
+pkgver=1.0.59
+pkgrel=1
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
 arch=('any')
-license=('GPL')
+license=('MIT')
 url="http://packages.debian.org/sid/debootstrap"
-depends=('binutils' 'wget')
+depends=('wget')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb"
+        "${_pkgname}.8.gz"
         'gnewsense'
         'trisquel')
 install="debootstrap.install"
-md5sums=('1ea9c87d54b6cf9349d602406bf43e5a'
+md5sums=('16d5acf9a2676692a57b662975b70170'
+         'b565d089342b8a7ee35166b5d90825c7'
          '13978bdd1d877a0dd2c3c874ecd54f03'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
-  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  tar -xJf "${srcdir}/data.tar.xz" -C "${pkgdir}/"
+  # remove Debian files
+  rm -v "${pkgdir}/usr/share/doc/debootstrap"/{README,changelog.gz}
+  rm -v "${pkgdir}/usr/share/man/man8/debootstrap.8.gz"
   # remove Debian scripts
   rm -v "${pkgdir}/usr/share/debootstrap/scripts"/*
   # move the executables to /usr/bin
@@ -31,7 +36,15 @@ package(){
   # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
   sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"  
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+
+  # add rebranded man
+  install -m644 ${_pkgname}.8.gz  "${pkgdir}/usr/share/man/man8"
+
+  # move license to licenses folder
+  install -Dm644 "${pkgdir}/usr/share/doc/debootstrap/copyright" \
+  "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  rm -rv "${pkgdir}/usr/share/doc"
 
   # add gNewSense script
   install -m644  gnewsense        "$pkgdir/usr/share/debootstrap/scripts"
@@ -44,10 +57,12 @@ package(){
 
   # create Trisquel symlinks
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/awen"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/belenos"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/brigantia"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dagda"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dwyn"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/robur"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/slaine"
   ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/taranis"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/toutatis"
 }
diff --git a/pcr/debootstrap-libre/debootstrap.8.gz b/pcr/debootstrap-libre/debootstrap.8.gz
new file mode 100644
index 000000000..07ec4808c
--- /dev/null
+++ b/pcr/debootstrap-libre/debootstrap.8.gz