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

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 33 insertions, 27 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/Manifest b/app-office/libreoffice/Manifest
index cffdeef5aea0..e1b4de6eef08 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,26 +22,26 @@ DIST libreoffice-help-4.0.5.2.tar.xz 1858248 SHA256 eba8c993fb558eaf970a1411ad96
 DIST libreoffice-help-4.1.1.2.tar.xz 1847556 SHA256 5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965 SHA512 4c2b69b171a079b1169a2474f4fa9ca3f8f2c04fd564f724ea55588596d140486eebd06150edfe3b9f01a6324d142aa0222cdfa4fe28e2fb1571091aca42e426 WHIRLPOOL 9380d858c77afaf3b97d755327f8760705c4e78fa6e2045b0721d39b97deb9aa7f14bdc846b4399e16ee7f4a1b8043e267e6a5aed9a3c46bbaf687ccd97e3e62
 EBUILD libreoffice-4.0.4.2.ebuild 17531 SHA256 79fb76dc340531f072546a2de2fe556c26b6716def3952bc714a72dce10bd2e8 SHA512 e8375e81006fd636e4130340600f6f4f1252394473681f5bf09c56878065128d1ec521cdddbe9ced8bd11a5d0239e3cbdc2db9d79421c4ecb81b1894caef1476 WHIRLPOOL b201e9eeeebf00ae04b01de50a8e568b8609486d2f1f2fa1842ddde88518504d4f3aa74b89fb7a62f2e9a1e1493981abc8b902ecd8f41e195d2c718de093ec40
 EBUILD libreoffice-4.0.5.2.ebuild 17581 SHA256 10056e914130862312a4ff68f4a5dcc18724e9d19977c6129dde392ba116316f SHA512 4a06b6887d8fb772f468c507c2fb04e3d09842df9588568e93a98f768fb724d87849e9197ccff3fe705a690c22daef5a84e1c531313a4af8487b1cae340c1c94 WHIRLPOOL 6855827e3bef38f1625e44039aa8a81ce1db3d70e71c3aafd55110b510b6b5842d073662067a7a1da36b8dff941f7dfdae5ee69c7ff7345f47e392bb1d46ed31
-EBUILD libreoffice-4.0.9999.ebuild 17538 SHA256 3256cf2c681fbbf08afe72246d0432fb112e7c82a2cb1689f4fdfe20635f9758 SHA512 ee9f1d9abf141aca8b9b0472c71feff6ccdda326aef74e23ad76963b9fe743a37c81cbe4cefd8994a9de4e1eba592d4c5829e689da2bcf05aa85998980d624db WHIRLPOOL 42184f9200b3db3de4e7c795bd5e5889f588811406267fae3fb7d19568e4f199d312d5c29987d36327c6ac42099a3b51b2e2f108f6218362d0b8ebf00d5bdee3
-EBUILD libreoffice-4.1.1.2.ebuild 17402 SHA256 ca388f28498c0d6ca715c795b2619bea680df40c8f851cec272757fd34eeff9f SHA512 fca22fc8b2b14ce5c42d784e1157c010304bdbedc42e561081c3391289021dcc6d199f69400fbd66f342f176e85ee0dc20b1f778f2a5c1b795c7bda1edc32470 WHIRLPOOL 9de171bc6b9ffc9e1f2d34a55235eed443d686a8887a2ac8e00e4b9ecac9287715f9730100a3980b908217787aedb964bddbaa7e7f219ab8aa9533a986040dff
-EBUILD libreoffice-4.1.9999.ebuild 17358 SHA256 b8a172130e1a359ba3a68c38bffb52f55c7bf6cce9b1a3799d7b5f52c776f51c SHA512 aced1f20f58f04a6c4eba6e1f6e57c84974181cd8b633feb50842ecc90c112a0f16f50a6070c228b025a2b10aa959931976e373fa1ef068591fb5cb011a121d9 WHIRLPOOL 91b30079acdeca15b0cd19fe82bfacdd13bb8c612715d84b16e33bd3212099de32a890a28194e852e19a8be871d468db452daa3989f7f0a7310f19495cce7a4a
-EBUILD libreoffice-9999-r2.ebuild 17531 SHA256 5b15ec2ffcf5e361d407d381edf46724bb965c14424de43d84f97f6b64129a7d SHA512 019d53a0b1121f2bdaace012143b44ec3b123bdcc0c32a67ac6d300cdd9ef8cdcc479bffb98cd567232e21740b2f04cda6ad2bc3304881dba8996722424e9ac7 WHIRLPOOL 0dee0b706ecf5eda7d53e28f3cb7a8509c0a217946d9f7479e7ac360fc3d439493d44f9c7deb083c6c0848c646c928b55a99746f6763229f1f1e0333b6a96024
-MISC ChangeLog 91114 SHA256 4653345fe8808e19aa76305c1174a6d1a12726b0183c22f7bf352bbad1d37af1 SHA512 700e3c8d8d036b35be536e658d7bd66b692889d04bfed3bd45af57b33dececfe83c99218893ed7750368aa0bb5e6cdbf73b309f7a0d80e55fbfccad2550e5311 WHIRLPOOL dfbba5b4cab619ce64a46fda4f8d974f74093d99496807936a63621a592a3e3a106a7f26f8d3306132e1a18e72154bc8f4dbb8090a328cc53a75802abc80762c
+EBUILD libreoffice-4.0.9999.ebuild 17539 SHA256 c57fe022fb24ad53edc6c3017a557e95fcb96103038d282a0da6b6212f8833fd SHA512 d454921a9cee0fb375e96e855240abf9d986ecd57e021b49a26a9fcba68b32aae2b6d48be22276c9d81e36eb4896ebe5a970ac3edb568931ccd29cc9449a706e WHIRLPOOL 94a811ad601f31737cf4776e0f18bb14aa5a3aee25201dd7e30f8776206d9203eefe7330c4d0465764a0b37025d29c4ff29a78f29532c06de01d1fec465b130f
+EBUILD libreoffice-4.1.1.2.ebuild 17404 SHA256 e0e52132a5dfa6bf02c732d42b2cbbdd42814f2d35b89668d5939352da616ae0 SHA512 55ca784b533c56158c58f681de6ac2605e3a3a0914ad14901af4ce3ed5fbbf566f2cb8068b15c01b40cb87a05c4c2d80e3eaea4633e214f9bff6f88fdabf3beb WHIRLPOOL e5c0a58f20b4930c7f302e7e5cbb96f7fbb3895910136a0204a4ac4fc686a81d468fd45ac0889efb39f12c74d22fe8d26c1da792f774522bfbd79cdb2085901e
+EBUILD libreoffice-4.1.9999.ebuild 17360 SHA256 c1272c3fa1a4537a20fff4934a4b7d30d0c38e5cd100dfec9b56a76e499b256a SHA512 57dcb5a5ace425fb596602289d6a68b9a3bd4f38191caf38b381c46a601016b7a6a038b4ebea272f0ffef3ddd3b7ace6abc7e232301c5cb0ce6c631cf8745ab9 WHIRLPOOL a9ba495d5430d4e075182253e0bacb0076a2144e8c865791a9f20262d4e0a5e21ae0d7b761ed039b619156216e8101b9d7615b6b62f13c52b64c51e7da9d06e2
+EBUILD libreoffice-9999-r2.ebuild 17533 SHA256 1f19350541c8d3767ca44f3750b5cf235dce8c5aecdb650b736ed974e5255163 SHA512 ef3afb7bf9a270bbdfcc882dd32881ab9ad4d5e9768302f0f926235594bf5d5256803087eaf0cdc8a0edde9dea2218646e0e8a86f923073214f4ab74cf8ce6a7 WHIRLPOOL 554a35d031e14346b459d234b9eefcb3e1e871a56c5a2e45020db37fdf90b693bb31a2e593a1e79f11dfd2604e58453a2af48eca712e623d1961b106e277265a
+MISC ChangeLog 91379 SHA256 d523bf3559dddc0393794cc84f8f7f4181235dd97fb46eaa80d4f81b2af7d383 SHA512 1c590ab143339f6054b8927f23e06fe3a8504ff7f56f1c0ab60259da961362d4c6eb00366f70346d6cd2cf0a2a322fc083b45da7f959daceab5a32730f02805b WHIRLPOOL 73a921d91a6547aa56fa8d22d1eb34b4a2aa767e42b9b8f3fbbb5a3d1c814b841d03990b61a67796ee2519606928811628e8fdb123cae8680f7a33f68220b815
 MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSL0VpAAoJEOSiRoyO7jvoeakP/iGOK9MJxaH3111AKoUBvLPR
-z17Bz+/PmALcbd3OwpUJA2PpSoUDDqN/hRTsMYHdMnxFpxdH8AUcl7VN5ZgQC/rM
-y4MklpRQhVe2KC/n44DY+YT6AElsg5kwbKWRFhx8HxG8mrqBc4uKKT9YJabjt8+5
-gvWkeOLdaaZPij0N3p6fw7vJWPHULjCi4mrbmdSf3YannFTItj32O92udxdLY3MX
-GvmGrXq/HGHu9XSfQRwQIzJvoTC/4C9i07YqX52kQ21lYY4HgoC4TFG1YZnwTo4e
-15Ae+5Be0zo48buV2LZzIgXbfOuXM4Rod35MzJ4K3Ln7NxQxKXcaqdbiivhwLwmB
-nVmHplLr9Cnm9FjFeT0d+fv/v+ck/J+RrQrxNSe1s7pJIGY/N9Cprff2M+nGxKF8
-Aqqw0WyMtuVl/mtUAG3ltbF1HTO1UHGzjwcHgBkmQ3LJBxDX+0mS5qgkvgQ9Pm/0
-eUBpFOuc1Bexm79Lw2TzpOGgiH0eYp0TeAmbJQuYg/fzNkGoHK88/X53lUfgf0Mk
-uCoqb6TjyUcfdb/Jnd/zkbFfXKAtS649ISL+1HJlMrLFI1SGxJGMUobzl6oJ0cZA
-v1yqDwR0IcrCFj5lfbgtcGcKtk11XKj7l+69a9lyPaDeAXtWGkzObdX0AXNmbdlN
-dHfeq3cbkBuggd/vOUjE
-=k66C
+iQIcBAEBCAAGBQJSNYphAAoJEOSiRoyO7jvoKnsP/AnxyMIFPmC6rFUhI2kwwEYj
+avfdTn8zEgco172N8KpgvQ5zy6C1rumZvuCucxaS0/aFrnxjWBcgqpR3Rsk+RHBI
+lTcIJop2nTziAEVa2Cyjcx6J3xJRCpxJRtp3Rz5FLgd/Kql8fUID+mk6Q0aYBuNU
+kJuYzigVek4FNtRd8/DvQQXzFL1zi3h7YpG1dvIb385qV3widguQrs9Y8whKSrMv
+nm38N2HQ+3m5YdTKjXSdsS2yfhZq35Sjr0262f4OMhffw4lHogKbkwsZgaffY0x1
+hwE1U/GsvGmRTpE8M4jYVkrmaIs46g8DjdxaKYXcCOFDWx7yZu2EZpuihBDR7GZC
+CwEOUClWyzf1CzLAX+AQf+Oedb60AIguxMo25E3trz0Xi2iN4LWvJr100yHk6Tpx
+e3hC5A8dda7oDl1lvVSZLHnzoy1JuR6ZHm3p9nYtYiPdg3Qo5m75EoAfh4YARJ09
+Qj1fj3bn/jTq0WSj7mLiArY0S7BWySd54aNUicZ2encfORogopaa2nnfAforplHi
+wUy72V/c5arqHFgA91UBpgUKd8SW+mxatcd3JafE9H+gAGU1RPbmTESw8gdKXzo9
+PYZY1ioET6Q/3K5Q0/l6FeeKKvdLU/Ag3HPjrYjqX6uKVyOgsYfLSWuXnJFiS1bG
+r0qo3XqdDxB+hAKcD0Rm
+=1ybU
 -----END PGP SIGNATURE-----
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