summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-14 10:13:06 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-14 10:13:06 +0000
commit4883d0b104cf96e8ce68d9664f8b0e15d0051916 (patch)
tree78b4636cd5c79931b7366978e41e96fc2c3fae0d
parentstable ppc, bug #442440 (diff)
downloadgentoo-2-4883d0b104cf96e8ce68d9664f8b0e15d0051916.tar.gz
gentoo-2-4883d0b104cf96e8ce68d9664f8b0e15d0051916.tar.bz2
gentoo-2-4883d0b104cf96e8ce68d9664f8b0e15d0051916.zip
Also symlink the nsplugin. Drop no longer needed disable.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 001c53f2ab04..4ad40461eecc 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# 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.390 2012/11/12 19:40:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.391 2012/11/14 10:13:06 scarabeus Exp $
+
+ 14 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Also symlink the nsplugin. Drop no longer needed disable.
12 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
Add back the nsplugin.
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index b6557294ea54..bd9f2c6018df 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.126 2012/11/12 19:40:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.127 2012/11/14 10:13:06 scarabeus Exp $
EAPI=4
@@ -425,8 +425,6 @@ src_configure() {
# --disable-kde: kde3 support
# --disable-mozilla: mozilla internal is for contact integration, never
# worked on linux
- # --disable-nsplugin: does not work at all, reall effort to fix this
- # required
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-systray: quickstarter does not actually work at all so do not
@@ -462,7 +460,6 @@ src_configure() {
--disable-kdeab \
--disable-kde \
--disable-mozilla \
- --disable-nsplugin \
--disable-online-update \
--disable-pch \
--disable-rpath \
@@ -557,6 +554,9 @@ src_install() {
newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
+ # symlink the nsplugin to proper location
+ use nsplugin && 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