Version bump, thanks to Andreas Sturmlechner

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

9 files changed, 2129 insertions, 13 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a6a87d1d6e6f..273ea9fa10e2 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.581 2014/09/14 09:11:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.582 2014/09/16 09:14:01 dilfridge Exp $
+
+*libreoffice-4.3.9999 (16 Sep 2014)
+*libreoffice-4.3.1.2 (16 Sep 2014)
+
+  16 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libreoffice-4.3.1.2.ebuild, +libreoffice-4.3.9999.ebuild,
+  libreoffice-9999-r2.ebuild,
+  +files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch,
+  +files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch,
+  +files/libreoffice-4.3.1.2-implement--with-system-gltf.patch,
+  +files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch:
+  Version bump, thanks to Andreas Sturmlechner
 
   14 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-4.2.5.2.ebuild, libreoffice-4.2.6.3.ebuild,
diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch
new file mode 100644
index 000000000000..d7166f375a3b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch
@@ -0,0 +1,228 @@
+From 6d239ee19a4b1d9068fbd04b5a692c859142f613 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com>
+Date: Fri, 29 Aug 2014 14:14:31 +0200
+Subject: [PATCH] Handle collada libraries seperately: --disable-collada
+
+Depends on gltf support.
+
+(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507)
+
+Conflicts:
+	config_host.mk.in
+	sd/source/ui/func/fuinsert.cxx
+
+Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
+Reviewed-on: https://gerrit.libreoffice.org/11193
+Tested-by: Rene Engelhard <rene@debian.org>
+Reviewed-by: Rene Engelhard <rene@debian.org>
+---
+ RepositoryExternal.mk                   |  6 +++++-
+ avmedia/Library_avmedia.mk              |  5 +----
+ avmedia/source/framework/modeltools.cxx |  9 ++++++---
+ config_host.mk.in                       |  1 +
+ config_host/config_features.h.in        |  5 +++++
+ configure.ac                            | 23 +++++++++++++++++++----
+ include/avmedia/modeltools.hxx          |  4 ++++
+ sd/source/ui/func/fuinsert.cxx          |  9 +++++++++
+ 8 files changed, 50 insertions(+), 12 deletions(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index b42dce2..cd99108 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -3324,6 +3324,8 @@ endef
+ 
+ endif # SYSTEN_LIBGLTF
+ 
++ifeq ($(ENABLE_COLLADA),TRUE)
++
+ define gb_LinkTarget__use_opencollada_parser
+ $(call gb_LinkTarget_set_include,$(1),\
+ 	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
+@@ -3354,7 +3356,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
+ )
+ endef
+ 
+-endif
++endif # ENABLE_COLLADA
++
++endif # ENABLE_GLTF
+ 
+ ### Jars ############################################################
+ 
+diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
+index 184c66c..7cc08fa 100644
+--- a/avmedia/Library_avmedia.mk
++++ b/avmedia/Library_avmedia.mk
+@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
+ ))
+ endif
+ 
+-ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
++ifeq ($(ENABLE_COLLADA),TRUE)
+ $(eval $(call gb_Library_set_warnings_not_errors,avmedia))
+ 
+ ifeq ($(OS),LINUX)
+@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\
+ 	png \
+ ))
+ 
+-$(eval $(call gb_Library_add_defs,avmedia,\
+-	-DENABLE_COLLADA2GLTF \
+-))
+ endif
+ 
+ $(eval $(call gb_Library_add_exception_objects,avmedia,\
+diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
+index 6119cb7..8c4251e 100644
+--- a/avmedia/source/framework/modeltools.cxx
++++ b/avmedia/source/framework/modeltools.cxx
+@@ -29,7 +29,9 @@
+ #include <boost/foreach.hpp>
+ #include <boost/optional.hpp>
+ 
+-#ifdef ENABLE_COLLADA2GLTF
++#include <config_features.h>
++
++#if HAVE_FEATURE_COLLADA
+ #include <COLLADA2GLTFWriter.h>
+ #include <GLTFAsset.h>
+ #endif
+@@ -42,7 +44,7 @@ using namespace boost::property_tree;
+ 
+ namespace avmedia {
+ 
+-#ifdef ENABLE_COLLADA2GLTF
++#if HAVE_FEATURE_COLLADA
+ 
+ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL)
+ {
+@@ -242,7 +244,8 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
+         const OUString& rSourceURL, OUString& o_rEmbeddedURL)
+ {
+     OUString sSource = rSourceURL;
+-#ifdef ENABLE_COLLADA2GLTF
++
++#if HAVE_FEATURE_COLLADA
+     if( !rSourceURL.endsWithIgnoreAsciiCase(".json") )
+         KmzDae2Gltf(rSourceURL, sSource);
+ #endif
+diff --git a/config_host.mk.in b/config_host.mk.in
+index aec0fa5..36a6866 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -109,6 +109,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+ export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
+ export ENABLE_CMIS=@ENABLE_CMIS@
+ export ENABLE_COINMP=@ENABLE_COINMP@
++export ENABLE_COLLADA=@ENABLE_COLLADA@
+ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
+ export ENABLE_CUPS=@ENABLE_CUPS@
+ export ENABLE_CURL=@ENABLE_CURL@
+diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
+index 3fd1da5..f87ee27 100644
+--- a/config_host/config_features.h.in
++++ b/config_host/config_features.h.in
+@@ -142,4 +142,9 @@
+  */
+ #define HAVE_FEATURE_GLTF 0
+ 
++/*
++ * Whether we have COLLADA support.
++ */
++#define HAVE_FEATURE_COLLADA 0
++
+ #endif
+diff --git a/configure.ac b/configure.ac
+index 63e067b..b6e8124 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1395,6 +1395,10 @@ AC_ARG_ENABLE(gltf,
+     AS_HELP_STRING([--disable-gltf],
+         [Determines whether to build libraries related to glTF 3D model rendering.]))
+ 
++AC_ARG_ENABLE(collada,
++    AS_HELP_STRING([--disable-collada],
++        [Disable collada support (Rendering 3D models stored in *.dae and *.kmz format).]))
++
+ dnl ===================================================================
+ dnl Optional Packages (--with/without-)
+ dnl ===================================================================
+@@ -10572,10 +10576,6 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And
+     else
+     	BUILD_TYPE="$BUILD_TYPE LIBGLTF"
+     fi
+-    # otherwise build fails in collada2gltf external because of std::shared_ptr
+-    if test "$have_std_shared_ptr" = "yes"; then
+-        BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
+-    fi
+ else
+     AC_MSG_RESULT([no])
+ fi
+@@ -10584,6 +10584,21 @@ AC_SUBST(SYSTEM_LIBGLTF)
+ AC_SUBST(LIBGLTF_CFLAGS)
+ AC_SUBST(LIBGLTF_LIBS)
+ 
++dnl ===================================================================
++dnl Check whether to enable COLLADA support
++dnl ===================================================================
++AC_MSG_CHECKING([whether to enable COLLADA support])
++ENABLE_COLLADA=
++if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE" -a "$have_std_shared_ptr" = "yes"; then
++    AC_MSG_RESULT([yes])
++    ENABLE_COLLADA=TRUE
++    AC_DEFINE(HAVE_FEATURE_COLLADA,1)
++    BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
++else
++    AC_MSG_RESULT([no])
++fi
++AC_SUBST(ENABLE_COLLADA)
++
+ # pdf import?
+ AC_MSG_CHECKING([whether to build the PDF import feature])
+ ENABLE_PDFIMPORT=
+diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
+index ed2de44..526b240 100644
+--- a/include/avmedia/modeltools.hxx
++++ b/include/avmedia/modeltools.hxx
+@@ -11,9 +11,13 @@
+ #include <com/sun/star/frame/XModel.hpp>
+ #include <avmedia/avmediadllapi.h>
+ 
++#include <config_features.h>
++
+ namespace avmedia {
+ 
++#if HAVE_FEATURE_COLLADA
+ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput);
++#endif
+ 
+ bool AVMEDIA_DLLPUBLIC Embed3DModel(
+     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
+diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
+index cd03700..9c1c4ad 100644
+--- a/sd/source/ui/func/fuinsert.cxx
++++ b/sd/source/ui/func/fuinsert.cxx
+@@ -789,10 +789,19 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
+     sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ 
+     aDlg.SetTitle( "Insert 3D Model" );
++
++#if HAVE_FEATURE_COLLADA
+     aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz"  );
++#else
++    aDlg.AddFilter( "All supported formats", "*.json"  );
++#endif
++
+     aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" );
++
++#if HAVE_FEATURE_COLLADA
+     aDlg.AddFilter( "DAE - COLLADA", "*.dae" );
+     aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz"  );
++#endif
+ 
+     OUString sURL;
+     if( aDlg.Execute() == ERRCODE_NONE )
+-- 
+2.1.0
+
diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch
new file mode 100644
index 000000000000..68942e54b13b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch
@@ -0,0 +1,98 @@
+From d85f513934bb5735a2c0c343fbe7dc2b9c11af3e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Wed, 6 Aug 2014 00:03:21 +0200
+Subject: [PATCH] implement --with-system-coinmp
+
+Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658
+---
+ RepositoryExternal.mk |   15 +++++++++++++++
+ config_host.mk.in     |    3 +++
+ configure.ac          |   16 ++++++++++++++--
+ 3 files changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index a9c9e53..1961829 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -2250,6 +2250,8 @@ endif # ENABLE_LPSOLVE
+ 
+ ifneq ($(ENABLE_COINMP),)
+ 
++ifneq ($(SYSTEM_COINMP),TRUE)
++
+ define gb_LinkTarget__use_coinmp
+ $(call gb_LinkTarget_use_package,$(1),coinmp)
+ ifeq ($(COM),MSC)
+@@ -2279,6 +2281,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ 	coinmp \
+ ))
+ 
++else # SYSTEM_COINMP
++
++define gb_LinkTarget__use_coinmp
++$(call gb_LinkTarget_set_include,$(1),\
++       $$(INCLUDE) \
++       $(COINMP_CFLAGS) \
++)
++$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS))
++
++endef
++
++endif
++
+ else
+ 
+ gb_LinkTarget__use_coinmp :=
+diff --git a/config_host.mk.in b/config_host.mk.in
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -109,6 +109,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+ export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
+ export ENABLE_CMIS=@ENABLE_CMIS@
+ export ENABLE_COINMP=@ENABLE_COINMP@
++export SYSTEM_COINMP=@SYSTEM_COINMP@
++export COINMP_CFLAGS=@COINMP_CFLAGS@
++export COINMP_LIBS=@COINMP_LIBS@
+ export ENABLE_COLLADA=@ENABLE_COLLADA@
+ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
+ export ENABLE_CUPS=@ENABLE_CUPS@
+diff --git a/configure.ac b/configure.ac
+index e91773f..3aadd12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1867,6 +1867,11 @@ AC_ARG_WITH(system-lpsolve,
+         [Use lpsolve already on system.]),,
+     [with_system_lpsolve="$with_system_libs"])
+ 
++AC_ARG_WITH(system-coinmp,
++    AS_HELP_STRING([--with-system-coinmp],
++        [Use CoinMP already on system.]),,
++    [with_system_coinmp="$with_system_libs"])
++
+ AC_ARG_WITH(system-liblangtag,
+     AS_HELP_STRING([--with-system-liblangtag],
+         [Use liblangtag library already on system.]),,
+@@ -9661,12 +9666,19 @@ AC_MSG_CHECKING([whether to build with CoinMP])
+ if test "$enable_coinmp" != "no"; then
+     ENABLE_COINMP=TRUE
+     AC_MSG_RESULT([yes])
+-    # Should we check for system CoinMP ? How to do that ?
+-    BUILD_TYPE="$BUILD_TYPE COINMP"
++    if test "$with_system_coinmp" = "yes"; then
++	SYSTEM_COINMP=TRUE
++	PKG_CHECK_MODULES( COINMP, coinmp )
++    else
++    	BUILD_TYPE="$BUILD_TYPE COINMP"
++    fi
+ else
+     AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(ENABLE_COINMP)
++AC_SUBST(SYSTEM_COINMP)
++AC_SUBST(COINMP_CFLAGS)
++AC_SUBST(COINMP_LIBS)
+ 
+ ENABLE_LPSOLVE=
+ AC_MSG_CHECKING([whether to build with lpsolve])
+-- 
+1.7.1
diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch
new file mode 100644
index 000000000000..cf208b7e2144
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch
@@ -0,0 +1,157 @@
+From 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Tue, 5 Aug 2014 20:05:35 +0200
+Subject: [PATCH] implement --with-system-gltf
+
+Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
+(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb)
+---
+ RepositoryExternal.mk                     | 18 ++++++++++++++++++
+ avmedia/source/opengl/oglframegrabber.hxx |  4 ++++
+ avmedia/source/opengl/oglplayer.hxx       |  4 ++++
+ avmedia/source/opengl/oglwindow.hxx       |  4 ++++
+ config_host.mk.in                         |  3 +++
+ configure.ac                              | 15 ++++++++++++++-
+ 6 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index ff50598..b42dce2 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -3281,6 +3281,8 @@ endif # DESKTOP
+ 
+ ifeq ($(ENABLE_GLTF),TRUE)
+ 
++ifneq ($(SYSTEM_LIBGLTF),TRUE)
++
+ define gb_LinkTarget__use_libgltf
+ $(call gb_LinkTarget_set_include,$(1),\
+     -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
+@@ -3306,6 +3308,22 @@ $(call gb_ExternalProject_use_external_project,$(1),libgltf)
+ 
+ endef
+ 
++else # SYSTEM_LIBGLTF
++
++define gb_LinkTarget__use_libgltf
++$(call gb_LinkTarget_set_include,$(1),\
++	$$(INCLUDE) \
++	$(LIBGLTF_CFLAGS) \
++)
++$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
++$(call gb_LinkTarget_add_defs,$(1),\
++	-DSYSTEM_LIBGLTF \
++)
++
++endef
++
++endif # SYSTEN_LIBGLTF
++
+ define gb_LinkTarget__use_opencollada_parser
+ $(call gb_LinkTarget_set_include,$(1),\
+ 	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
+diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
+index 5beb15b..0d38224 100644
+--- a/avmedia/source/opengl/oglframegrabber.hxx
++++ b/avmedia/source/opengl/oglframegrabber.hxx
+@@ -14,7 +14,11 @@
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/media/XFrameGrabber.hpp>
+ 
++#ifdef SYSTEM_LIBGLTF
++#include <libgltf/libgltf.h>
++#else
+ #include <libgltf.h>
++#endif
+ 
+ namespace avmedia { namespace ogl {
+ 
+diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
+index 03ad515..52aa395 100644
+--- a/avmedia/source/opengl/oglplayer.hxx
++++ b/avmedia/source/opengl/oglplayer.hxx
+@@ -14,7 +14,11 @@
+ #include <cppuhelper/basemutex.hxx>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/media/XPlayer.hpp>
++#ifdef SYSTEM_LIBGLTF
++#include <libgltf/libgltf.h>
++#else
+ #include <libgltf.h>
++#endif
+ #include <vcl/opengl/OpenGLContext.hxx>
+ #include <vcl/timer.hxx>
+ 
+diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
+index a68f667..ae86083 100644
+--- a/avmedia/source/opengl/oglwindow.hxx
++++ b/avmedia/source/opengl/oglwindow.hxx
+@@ -17,7 +17,11 @@
+ #include <com/sun/star/media/XPlayerWindow.hpp>
+ #include <com/sun/star/media/ZoomLevel.hpp>
+ 
++#ifdef SYSTEM_LIBGLTF
++#include <libgltf/libgltf.h>
++#else
+ #include <libgltf.h>
++#endif
+ #include <vcl/opengl/OpenGLContext.hxx>
+ #include <vcl/syschild.hxx>
+ 
+diff --git a/config_host.mk.in b/config_host.mk.in
+index b7e5b6c..aec0fa5 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
+ export ENABLE_ORCUS=@ENABLE_ORCUS@
+ export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
+ export ENABLE_GLTF=@ENABLE_GLTF@
++export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@
++export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@
++export LIBGLTF_LIBS=@LIBGLTF_LIBS@
+ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
+ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
+ export ENABLE_GTK3=@ENABLE_GTK3@
+diff --git a/configure.ac b/configure.ac
+index 02791ca..63e067b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1552,6 +1552,11 @@ AC_ARG_WITH(system-jpeg,
+         [Use jpeg already on system.]),,
+     [with_system_jpeg=auto])
+ 
++AC_ARG_WITH(system-libgltf,
++    AS_HELP_STRING([--with-system-libgltf],
++        [Use libgltf already on system.]),,
++    [with_system_libgltf=auto])
++
+ AC_ARG_WITH(system-clucene,
+     AS_HELP_STRING([--with-system-clucene],
+         [Use clucene already on system.]),,
+@@ -10561,7 +10566,12 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And
+     ENABLE_GLTF=TRUE
+     AC_MSG_RESULT([yes])
+     AC_DEFINE(HAVE_FEATURE_GLTF,1)
+-    BUILD_TYPE="$BUILD_TYPE LIBGLTF"
++    if test "$with_system_libgltf" = "yes"; then
++	SYSTEM_LIBGLTF=TRUE
++	PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 )
++    else
++    	BUILD_TYPE="$BUILD_TYPE LIBGLTF"
++    fi
+     # otherwise build fails in collada2gltf external because of std::shared_ptr
+     if test "$have_std_shared_ptr" = "yes"; then
+         BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
+@@ -10570,6 +10580,9 @@ else
+     AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(ENABLE_GLTF)
++AC_SUBST(SYSTEM_LIBGLTF)
++AC_SUBST(LIBGLTF_CFLAGS)
++AC_SUBST(LIBGLTF_LIBS)
+ 
+ # pdf import?
+ AC_MSG_CHECKING([whether to build the PDF import feature])
+-- 
+2.1.0
+
diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch
new file mode 100644
index 000000000000..aa73be42c6c4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch
@@ -0,0 +1,400 @@
+From d431986bd49081581e86444af124d1d2ce90a407 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com>
+Date: Fri, 29 Aug 2014 22:41:26 +0200
+Subject: [PATCH] Upgrade libgltf to 0.0.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+News in this version:
+- Solve some limitations of walkthrough mode (fdo#81425)
+- Multisampling (better rendering quality, mainly at the edges)
+- Better error handling (no crash in case of invalid input file)
+
+Reviewed-on: https://gerrit.libreoffice.org/11179
+Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
+Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
+
+Conflicts:
+	download.lst
+	external/libgltf/UnpackedTarball_libgltf.mk
+	external/libgltf/pathces/append_shader_version.patch
+	external/libgltf/pathces/missing_include.patch
+	vcl/source/opengl/OpenGLContext.cxx
+
+Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794
+Reviewed-on: https://gerrit.libreoffice.org/11194
+Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
+Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
+---
+ RepositoryExternal.mk                              |  8 -----
+ avmedia/source/opengl/oglframegrabber.hxx          |  4 ---
+ avmedia/source/opengl/oglplayer.cxx                | 16 ++++++++--
+ avmedia/source/opengl/oglplayer.hxx                |  6 ++--
+ avmedia/source/opengl/oglwindow.cxx                | 36 +++++++++++----------
+ avmedia/source/opengl/oglwindow.hxx                |  6 +---
+ configure.ac                                       |  2 +-
+ download.lst                                       |  4 +--
+ external/libgltf/ExternalProject_libgltf.mk        |  2 ++
+ external/libgltf/UnpackedTarball_libgltf.mk        |  2 --
+ .../libgltf/pathces/append_shader_version.patch    | 37 ----------------------
+ external/libgltf/pathces/missing_include.patch     | 11 -------
+ include/vcl/opengl/OpenGLContext.hxx               |  2 ++
+ vcl/source/opengl/OpenGLContext.cxx                |  5 +++
+ 14 files changed, 48 insertions(+), 93 deletions(-)
+ delete mode 100644 external/libgltf/pathces/append_shader_version.patch
+ delete mode 100644 external/libgltf/pathces/missing_include.patch
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index cd99108..f194fcb 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -3303,11 +3303,6 @@ $(call gb_LinkTarget_use_external_project,$(1),libgltf)
+ 
+ endef
+ 
+-define gb_ExternalProject__use_libgltf
+-$(call gb_ExternalProject_use_external_project,$(1),libgltf)
+-
+-endef
+-
+ else # SYSTEM_LIBGLTF
+ 
+ define gb_LinkTarget__use_libgltf
+@@ -3316,9 +3311,6 @@ $(call gb_LinkTarget_set_include,$(1),\
+ 	$(LIBGLTF_CFLAGS) \
+ )
+ $(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
+-$(call gb_LinkTarget_add_defs,$(1),\
+-	-DSYSTEM_LIBGLTF \
+-)
+ 
+ endef
+ 
+diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
+index 0d38224..5beb15b 100644
+--- a/avmedia/source/opengl/oglframegrabber.hxx
++++ b/avmedia/source/opengl/oglframegrabber.hxx
+@@ -14,11 +14,7 @@
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/media/XFrameGrabber.hpp>
+ 
+-#ifdef SYSTEM_LIBGLTF
+-#include <libgltf/libgltf.h>
+-#else
+ #include <libgltf.h>
+-#endif
+ 
+ namespace avmedia { namespace ogl {
+ 
+diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
+index a052dc9..d2e600b 100644
+--- a/avmedia/source/opengl/oglplayer.cxx
++++ b/avmedia/source/opengl/oglplayer.cxx
+@@ -269,6 +269,12 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
+         return uno::Reference< media::XPlayerWindow >();
+     }
+ 
++    if( !m_aContext.supportMultiSampling() )
++    {
++        SAL_WARN("avmedia.opengl", "Context does not support multisampling!");
++        return uno::Reference< media::XPlayerWindow >();
++    }
++
+     if( !lcl_CheckOpenGLRequirements() )
+     {
+         SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!");
+@@ -287,7 +293,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
+     releaseInputFiles();
+     if( nRet != 0 )
+     {
+-        SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet);
++        SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet);
+         return uno::Reference< media::XPlayerWindow >();
+     }
+     // The background color is white by default, but we need to separate the
+@@ -309,6 +315,12 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
+         return uno::Reference< media::XFrameGrabber >();
+     }
+ 
++    if( !m_aContext.supportMultiSampling() )
++    {
++        SAL_WARN("avmedia.opengl", "Context does not support multisampling!");
++        return uno::Reference< media::XFrameGrabber >();
++    }
++
+     if( !lcl_CheckOpenGLRequirements() )
+     {
+         SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!");
+@@ -324,7 +336,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
+     releaseInputFiles();
+     if( nRet != 0 )
+     {
+-        SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet);
++        SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet);
+         return uno::Reference< media::XFrameGrabber >();
+     }
+     glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
+index 52aa395..465ed6b 100644
+--- a/avmedia/source/opengl/oglplayer.hxx
++++ b/avmedia/source/opengl/oglplayer.hxx
+@@ -14,11 +14,9 @@
+ #include <cppuhelper/basemutex.hxx>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/media/XPlayer.hpp>
+-#ifdef SYSTEM_LIBGLTF
+-#include <libgltf/libgltf.h>
+-#else
++
+ #include <libgltf.h>
+-#endif
++
+ #include <vcl/opengl/OpenGLContext.hxx>
+ #include <vcl/timer.hxx>
+ 
+diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
+index a770ff5..1092483 100644
+--- a/avmedia/source/opengl/oglwindow.cxx
++++ b/avmedia/source/opengl/oglwindow.cxx
+@@ -23,7 +23,6 @@ OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEve
+     , meZoomLevel( media::ZoomLevel_ORIGINAL )
+     , m_aLastMousePos(Point(0,0))
+     , m_bIsOrbitMode( false )
+-    , m_fCameraDistance(0.0)
+ {
+ }
+ 
+@@ -267,15 +266,15 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
+                     glm::vec3 vMove = vView-vEye;
+                     vMove = glm::normalize(vMove);
+                     vMove *= 25.0f;
+-                    glm::vec3 vStrafe = glm::cross(vView-vEye, vUp);
++                    glm::vec3 vStrafe = glm::cross(vMove, vUp);
+                     vStrafe = glm::normalize(vStrafe);
+                     vStrafe *= 25.0f;
+-                    glm::vec3 vMup = glm::cross(vView-vEye,glm::vec3(1.0f,0.0f,0.0f) );
+-                    vMup = glm::normalize(vMup);
+-                    vMup *= 25.0f;
++                    glm::vec3 vMup = vUp * 25.0f;
+ 
+                     if( !m_bIsOrbitMode )
+                     {
++                        if(nCode == KEY_E)vMoveBy += vMup*(0.0005f*fModelSize);
++                        if(nCode == KEY_Q)vMoveBy -= vMup*(0.0005f*fModelSize);
+                         if(nCode == KEY_W)vMoveBy += vMove*(0.0005f*fModelSize);
+                         if(nCode == KEY_S)vMoveBy -= vMove*(0.0005f*fModelSize);
+                         if(nCode == KEY_A)vMoveBy -= vStrafe*(0.0005f*fModelSize);
+@@ -283,15 +282,24 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
+                     }
+                     else
+                     {
+-                        if(nCode == KEY_E)vMoveBy += vMove*(0.0005f*fModelSize);
+-                        if(nCode == KEY_Q)vMoveBy -= vMove*(0.0005f*fModelSize);
++                        bool bZoomIn = false;
++                        bool bZoomOut = false;
++                        if(nCode == KEY_E)
++                        {
++                            vMoveBy += vMove*(0.0005f*fModelSize);
++                            bZoomIn = true;
++                        }
++                        if(nCode == KEY_Q)
++                        {
++                            vMoveBy -= vMove*(0.0005f*fModelSize);
++                            bZoomOut = true;
++                        }
+ 
+                         // Limit zooming in orbit mode
+-                        m_fCameraDistance += vMoveBy.z;
+-                        if ((m_fCameraDistance < 0.5 * fModelSize && vMoveBy.z < 0.0 ) ||
+-                            (m_fCameraDistance > 2 * fModelSize && vMoveBy.z > 0.0 ))
++                        float fCameraDistFromModelGlobe = glm::length(vEye + vMoveBy - vView) - fModelSize / 2.0f;
++                        if ((fCameraDistFromModelGlobe < 0.5 * fModelSize && bZoomIn ) ||
++                            (fCameraDistFromModelGlobe > 2 * fModelSize && bZoomOut ))
+                         {
+-                            m_fCameraDistance -= vMoveBy.z;
+                             vMoveBy = glm::vec3(0.0);
+                         }
+                     }
+@@ -333,12 +341,6 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
+                 {
+                     gltf_orbit_mode_start(&m_rHandle);
+                     m_bIsOrbitMode = true;
+-                    // Set default camera distance
+-                    glm::vec3 vEye;
+-                    glm::vec3 vView;
+-                    glm::vec3 vUp;
+-                    gltf_get_camera_pos(&m_rHandle, &vEye,&vView,&vUp);
+-                    m_fCameraDistance = vEye.z - gltf_get_model_center_pos(&m_rHandle)->z - (gltf_get_model_size(&m_rHandle)/2.0);
+                 }
+             }
+             else if(nCode == KEY_F)
+diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
+index ae86083..8b15813 100644
+--- a/avmedia/source/opengl/oglwindow.hxx
++++ b/avmedia/source/opengl/oglwindow.hxx
+@@ -17,11 +17,8 @@
+ #include <com/sun/star/media/XPlayerWindow.hpp>
+ #include <com/sun/star/media/ZoomLevel.hpp>
+ 
+-#ifdef SYSTEM_LIBGLTF
+-#include <libgltf/libgltf.h>
+-#else
+ #include <libgltf.h>
+-#endif
++
+ #include <vcl/opengl/OpenGLContext.hxx>
+ #include <vcl/syschild.hxx>
+ 
+@@ -77,7 +74,6 @@ private:
+     com::sun::star::media::ZoomLevel meZoomLevel;
+     Point m_aLastMousePos;
+     bool m_bIsOrbitMode;
+-    double m_fCameraDistance;
+ };
+ 
+ } // namespace ogl
+diff --git a/configure.ac b/configure.ac
+index b6e8124..9cd589b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10572,7 +10572,7 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And
+     AC_DEFINE(HAVE_FEATURE_GLTF,1)
+     if test "$with_system_libgltf" = "yes"; then
+ 	SYSTEM_LIBGLTF=TRUE
+-	PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 )
++	PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] )
+     else
+     	BUILD_TYPE="$BUILD_TYPE LIBGLTF"
+     fi
+diff --git a/download.lst b/download.lst
+index bc2b383..f413a57 100644
+--- a/download.lst
++++ b/download.lst
+@@ -87,8 +87,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
+ export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
+ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
+ export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+-export LIBGLTF_MD5SUM := ca5436e916bfe70694adfe2607782786
+-export LIBGLTF_TARBALL := libgltf-0.0.0.tar.bz2
++export LIBGLTF_MD5SUM := 03821c9c827e647fb5fedb12496e0067
++export LIBGLTF_TARBALL := libgltf-0.0.1.tar.bz2
+ export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+ export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
+diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
+index 548487b..62e25a3 100644
+--- a/external/libgltf/ExternalProject_libgltf.mk
++++ b/external/libgltf/ExternalProject_libgltf.mk
+@@ -63,6 +63,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
+ 		export CPPFLAGS='$(libgltf_CPPFLAGS)' \
+ 		&& export PKG_CONFIG="" \
+ 		&& ./configure \
++			--disable-shared \
++			--enable-static \
+ 			--with-pic \
+ 			--disable-debug \
+ 			--disable-werror \
+diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
+index 42c821b..176c1d1 100644
+--- a/external/libgltf/UnpackedTarball_libgltf.mk
++++ b/external/libgltf/UnpackedTarball_libgltf.mk
+@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
+ 
+ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+-	external/libgltf/pathces/missing_include.patch \
+-	external/libgltf/pathces/append_shader_version.patch \
+ ))
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/libgltf/pathces/append_shader_version.patch b/external/libgltf/pathces/append_shader_version.patch
+deleted file mode 100644
+index 27f0cc6..0000000
+--- a/external/libgltf/pathces/append_shader_version.patch
++++ /dev/null
+@@ -1,37 +0,0 @@
+-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+---- libgltf.org/src/Shaders.cpp	2014-08-18 09:19:48.323955939 +0200
+-+++ libgltf/src/Shaders.cpp	2014-08-18 09:20:46.711953465 +0200
+-@@ -11,6 +11,7 @@
+- 
+- #include <GL/glew.h>
+- #include <cstdio>
+-+#include <cstring>
+- 
+- namespace libgltf
+- {
+-@@ -166,7 +167,24 @@
+-                                   unsigned int shaderId)
+- {
+-     GLint iGLSize = iSize;
+--    glShaderSource(shaderId, 1, &pShader, &iGLSize);
+-+    if( strstr(pShader,"#version") == 0 )
+-+    {
+-+        const GLchar* aSources[] = {
+-+            "#version 130\n",
+-+            pShader,
+-+        };
+-+
+-+        const GLint aSizes[] = {
+-+            strlen("#version 130\n"),
+-+            iGLSize,
+-+        };
+-+
+-+        glShaderSource(shaderId, 2, &aSources[0], &aSizes[0]);
+-+    }
+-+    else
+-+    {
+-+        glShaderSource(shaderId, 1, &pShader, &iGLSize);
+-+    }
+-     glCompileShader(shaderId);
+-     int iStatus = 0;
+-     glGetShaderiv(shaderId, GL_COMPILE_STATUS, &iStatus);
+diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/pathces/missing_include.patch
+deleted file mode 100644
+index 8b05224..0000000
+--- a/external/libgltf/pathces/missing_include.patch
++++ /dev/null
+@@ -1,11 +0,0 @@
+-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+---- libgltf.org/src/Shaders.cpp	2014-08-05 11:40:30.387537876 +0200
+-+++ libgltf/src/Shaders.cpp	2014-08-05 11:41:13.887536123 +0200
+-@@ -10,6 +10,7 @@
+- #include "Shaders.h"
+- 
+- #include <GL/glew.h>
+-+#include <cstdio>
+- 
+- namespace libgltf
+- {
+diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
+index 8a7eb55..f1e0bd2 100644
+--- a/include/vcl/opengl/OpenGLContext.hxx
++++ b/include/vcl/opengl/OpenGLContext.hxx
+@@ -166,6 +166,8 @@ public:
+         return mbInitialized;
+     }
+ 
++    bool supportMultiSampling() const;
++
+     static SystemWindowData generateWinData(Window* pParent);
+ private:
+     SAL_DLLPRIVATE bool initWindow();
+diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
+index 974f913..338edc3 100644
+--- a/vcl/source/opengl/OpenGLContext.cxx
++++ b/vcl/source/opengl/OpenGLContext.cxx
+@@ -833,4 +833,9 @@ void OpenGLContext::show()
+         m_pWindow->Show();
+ }
+ 
++bool OpenGLContext::supportMultiSampling() const
++{
++    return m_aGLWin.bMultiSampleSupported;
++}
++
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+-- 
+2.1.0
+
diff --git a/app-office/libreoffice/libreoffice-4.3.1.2.ebuild b/app-office/libreoffice/libreoffice-4.3.1.2.ebuild
new file mode 100644
index 000000000000..8d4747ec3b19
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.3.1.2.ebuild
@@ -0,0 +1,606 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.1.2.ebuild,v 1.1 2014/09/16 09:14:01 dilfridge Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.3.0
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	dev-cpp/libcmis:0.4
+	dev-db/unixODBC
+	>=dev-libs/boost-1.46:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/liborcus-0.7.0
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+	webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine-ttf
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.10.3:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+
+	# from libreoffice-4-3 branch
+	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-gltf.patch"
+	"${FILESDIR}/${PN}-4.3.1.2-handle-collada-libs-seperately.patch"
+	"${FILESDIR}/${PN}-4.3.1.2-upgrade-to-libgltf-0.0.1.patch"
+
+	# from master branch
+	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+				; then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql-base; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod mod2 dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		for mod in ${MODULES}; do
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_PROJECT="${PN}/${mod}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			EGIT_NOUNPACK="true"
+			git-2_src_unpack
+			if [[ ${mod} != core ]]; then
+				mod2=${mod}
+				# mapping does not match on help
+				[[ ${mod} == help ]] && mod2="helpcontent2"
+				mkdir -p "${S}/${mod2}/" || die
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i scripting/source/pyprov/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-mergelibs \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=${jbs} \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vba) \
+		$(use_enable vlc) \
+		$(use_enable webdav neon) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	rm -rf "${ED}"/etc/
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	fi
+
+	# symlink the nsplugin to proper location
+	# use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -rf "${ED}"/usr/share/mimelnk/
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
new file mode 100644
index 000000000000..d641c12fc078
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
@@ -0,0 +1,601 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.1 2014/09/16 09:14:01 dilfridge Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.3.0
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	dev-cpp/libcmis:0.4
+	dev-db/unixODBC
+	>=dev-libs/boost-1.46:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/liborcus-0.7.0
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+	webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine-ttf
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.10.3:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+
+	# from master branch
+	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+				; then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql-base; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod mod2 dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		for mod in ${MODULES}; do
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_PROJECT="${PN}/${mod}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			EGIT_NOUNPACK="true"
+			git-2_src_unpack
+			if [[ ${mod} != core ]]; then
+				mod2=${mod}
+				# mapping does not match on help
+				[[ ${mod} == help ]] && mod2="helpcontent2"
+				mkdir -p "${S}/${mod2}/" || die
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i scripting/source/pyprov/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-mergelibs \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=${jbs} \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vba) \
+		$(use_enable vlc) \
+		$(use_enable webdav neon) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	rm -rf "${ED}"/etc/
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	fi
+
+	# symlink the nsplugin to proper location
+	# use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -rf "${ED}"/usr/share/mimelnk/
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 95830664ced3..e37e229f004e 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.227 2014/09/14 09:11:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.228 2014/09/16 09:14:01 dilfridge Exp $
 
 EAPI=5
 
@@ -60,6 +60,8 @@ unset DEV_URI
 # If you want them gone, patches are welcome.
 ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
 ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
@@ -71,8 +73,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
 
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -100,11 +102,11 @@ COMMON_DEPEND="
 	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.2
 	>=app-text/libebook-0.1.1
-	app-text/libetonyek
+	>=app-text/libetonyek-0.1.1
 	app-text/liblangtag
-	app-text/libmspub
-	>=app-text/libmwaw-0.2
-	>=app-text/libodfgen-0.0.3
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
 	>=app-text/libwps-0.3.0
@@ -118,6 +120,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/libatomic_ops-7.2d
 	>=dev-libs/liborcus-0.7.0
+	>=dev-libs/librevenge-0.0.1
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9
 	>=dev-lang/perl-5.0
@@ -130,9 +133,9 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	media-libs/lcms:2
 	>=media-libs/libpng-1.4
-	>=media-libs/libcdr-0.1
-	>=media-libs/libfreehand-0.1
-	>=media-libs/libvisio-0.1
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	>=media-libs/libvisio-0.1.0
 	>=net-misc/curl-7.21.4
 	net-nds/openldap
 	sci-mathematics/lpsolve
@@ -142,10 +145,12 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.92 )
 	eds? ( gnome-extra/evolution-data-server )
 	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
 	gnome? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gdk-pixbuf[X]
@@ -244,6 +249,7 @@ PATCHES=(
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
+	collada? ( gltf )
 	gnome? ( gtk )
 	eds? ( gnome )
 	telepathy? ( gtk )
@@ -446,7 +452,6 @@ src_configure() {
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-largefile \
-		--enable-mergelibs \
 		--enable-python=system \
 		--enable-randr \
 		--enable-randr-link \
@@ -462,6 +467,7 @@ src_configure() {
 		--disable-report-builder \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-mergelibs \
 		--disable-online-update \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
@@ -482,11 +488,14 @@ src_configure() {
 		--with-helppack-integration \
 		--without-sun-templates \
 		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
 		$(use_enable cups) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable eds evolution2) \
 		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
@@ -502,6 +511,8 @@ src_configure() {
 		$(use_enable vba) \
 		$(use_enable vlc) \
 		$(use_enable webdav neon) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with gltf system-libgltf) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index ac78a7602692..3893f228eecd 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -8,12 +8,15 @@ compilation can take up to a day depending on the speed of your
 computer. It will however make a snappier openoffice than the binary 
 version</longdescription>
   <use>
+    <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
+    <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
+    <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
     <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
     <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag>
-	<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
+    <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
     <flag name="webdav">Adds support for HTTP content adding via <pkg>net-libs/neon</pkg></flag>
   </use>
 </pkgmetadata>