--- a/libreoffice-9999-r2.ebuild	2014-11-18 11:31:04.000000000 +0100
+++ b/libreoffice-4.4.0.1.ebuild	2014-12-20 19:28:16.354251593 +0100
@@ -74,7 +74,7 @@
 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"
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
 
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -93,11 +93,13 @@
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
+# FIXME: collada? ( media-libs/opencollada )
+#        how to configure system-collada?
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	app-arch/zip
 	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
+	>=app-text/hunspell-1.3.3
 	app-text/mythes
 	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.2
@@ -114,7 +116,7 @@
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.4
 	dev-db/unixODBC
-	>=dev-libs/boost-1.46:=
+	>=dev-libs/boost-1.47:=
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
 	>=dev-libs/icu-4.8.1.1:=
@@ -134,6 +136,7 @@
 	>=media-libs/libpng-1.4
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
 	>=media-libs/libvisio-0.1.0
 	>=net-misc/curl-7.21.4
 	net-libs/neon
@@ -144,6 +147,8 @@
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
 	bluetooth? ( net-wireless/bluez )
 	coinmp? ( sci-libs/coinor-mp )
 	cups? ( net-print/cups )
@@ -172,10 +177,6 @@
 		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
 	postgres? ( >=virtual/postgresql-9.0[kerberos] )
 	telepathy? (
 		dev-libs/glib:2
@@ -243,7 +244,7 @@
 
 PATCHES=(
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )
 
 REQUIRED_USE="
@@ -357,7 +358,7 @@
 		-e "s:%eprefix%:${EPREFIX}:g" \
 		-e "s:%libdir%:$(get_libdir):g" \
 		-i pyuno/source/module/uno.py \
-		-i scripting/source/pyprov/officehelper.py || die
+		-i pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
 		-e 's#all : build unitcheck#all : build#g' \
@@ -443,6 +444,7 @@
 	# --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
+	# FIXME: $(use_with collada system-opencollada)
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--with-system-headers \
@@ -452,6 +454,7 @@
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-largefile \
+		--enable-mergelibs \
 		--enable-neon \
 		--enable-python=system \
 		--enable-randr \
@@ -468,7 +471,6 @@
 		--disable-report-builder \
 		--disable-kdeab \
 		--disable-kde \
-		--disable-mergelibs \
 		--disable-online-update \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
@@ -500,16 +502,14 @@
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer) \
+		$(use_enable gstreamer gstreamer-1-0) \
 		$(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_with coinmp system-coinmp) \
 		$(use_with gltf system-libgltf) \
@@ -580,6 +580,10 @@
 	# Remove desktop files for support to old installs that can't parse mime
 	rm -rf "${ED}"/usr/share/mimelnk/
 
+	# FIXME: Hack add missing file
+	insinto /usr/$(get_libdir)/${PN}/program
+	doins "${S}"/instdir/program/libsaxlo.so
+
 	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
 	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }