Disable nsplugin as it mostly kills the browser or crashes. bug#415259 and bug#482314.

(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

5 files changed, 15 insertions, 9 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a0945e31943e..fdb01825d5fd 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.503 2013/09/10 16:14:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.504 2013/09/15 10:22:14 scarabeus Exp $
+
+  15 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-4.0.9999.ebuild, libreoffice-4.1.1.2.ebuild,
+  libreoffice-4.1.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Disable nsplugin as it mostly kills the browser or crashes. bug#415259 and
+  bug#482314.
 
   10 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild,
   metadata.xml:
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index a94adcbc893b..c0a59ca25a88 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.35 2013/08/27 16:06:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.36 2013/09/15 10:22:14 scarabeus Exp $
 
 EAPI=5
 
@@ -548,7 +548,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	# 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
diff --git a/app-office/libreoffice/libreoffice-4.1.1.2.ebuild b/app-office/libreoffice/libreoffice-4.1.1.2.ebuild
index 4fa5413590f5..af3884d39b99 100644
--- a/app-office/libreoffice/libreoffice-4.1.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.1.2.ebuild,v 1.1 2013/08/30 08:34:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.1.2.ebuild,v 1.2 2013/09/15 10:22:14 scarabeus Exp $
 
 EAPI=5
 
@@ -546,7 +546,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	# 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
diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
index 0573a1ed0dfb..8237cafbaa36 100644
--- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.11 2013/08/30 08:34:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.12 2013/09/15 10:22:14 scarabeus Exp $
 
 EAPI=5
 
@@ -545,7 +545,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	# 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
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index a1989ef74eec..417007dac6f0 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.193 2013/09/10 16:14:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.194 2013/09/15 10:22:14 scarabeus Exp $
 
 EAPI=5
 
@@ -549,7 +549,7 @@ src_install() {
 	fi
 
 	# symlink the nsplugin to proper location
-	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	# 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