Fix broken patch on live wrt bug#408059. Also fix offlinehelp wrt bug#404551.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

5 files changed, 72 insertions, 5 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 2c057eca694a..1c21021993cb 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.253 2012/03/09 13:50:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.254 2012/03/17 18:17:31 scarabeus Exp $
+
+  17 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.6-system-pyuno.patch, libreoffice-3.5.1.2.ebuild,
+  libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Fix broken patch on live wrt bug#408059. Also fix offlinehelp wrt bug#404551.
 
   09 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/libreoffice-3.5.1-kde-4.8.1-namespace.patch,
diff --git a/app-office/libreoffice/files/libreoffice-3.6-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-3.6-system-pyuno.patch
new file mode 100644
index 000000000000..4cef9bb87d8b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.6-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
+index defd7b2..ea2a809 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|FreeBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index f93ac5e..92a2891 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -26,8 +26,12 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 610ac5f..df243d0 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/officehelper.py
+@@ -53,7 +53,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
index ddba2ff97b44..a1f36c500a8f 100644
--- a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.2 2012/03/09 13:50:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.3 2012/03/17 18:17:31 scarabeus Exp $
 
 EAPI=4
 
@@ -494,6 +494,12 @@ src_install() {
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 	fi
+
+	# 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/main_transform.xsl
 }
 
 pkg_preinst() {
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 3700e5a4d42e..d417c7d31b17 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.20 2012/03/09 11:44:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.21 2012/03/17 18:17:31 scarabeus Exp $
 
 EAPI=4
 
@@ -493,6 +493,12 @@ src_install() {
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 	fi
+
+	# 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/main_transform.xsl
 }
 
 pkg_preinst() {
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 1f15ac112129..526b5a226a02 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.33 2012/03/09 11:07:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.34 2012/03/17 18:17:31 scarabeus Exp $
 
 EAPI=4
 
@@ -198,7 +198,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# this can't be upstreamed :(
-	"${FILESDIR}/${PN}-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
 )
 
 REQUIRED_USE="
@@ -495,6 +495,12 @@ src_install() {
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 	fi
+
+	# 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/main_transform.xsl
 }
 
 pkg_preinst() {