Enable nsplugin and gtk by default to provide sane defaults for linux.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index b3034054832b8adb6eda38374e012e2c431d2a47..3e5d57b76fb1f7397dfb1d0679c431750ac515a3 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.199 2011/11/12 14:29:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.200 2011/11/12 14:40:30 scarabeus Exp $
+
+  12 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r2.ebuild:
+  Enable nsplugin and gtk by default to provide sane defaults for linux.
 
 *libreoffice-9999-r2 (12 Nov 2011)
 *libreoffice-3.4.9999-r2 (12 Nov 2011)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 446be2b687663e77b60cb89427f3029d3380f8bf..e57196244787442a4c0da5552b8f950365eee258 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16537 RMD160 859a610da9e697a9e5b7832108f3f57dc9145d33 SHA1 0be702423727887cb1b42b3157766c0235fa03b5 SHA256 fe8abb5d7a09586e76f5181064f0d88ad91814db459084b332adbff4e80694d8
 EBUILD libreoffice-3.4.9999-r2.ebuild 15026 RMD160 8d20c6104f2e9f80c6a92967591b0cbd56230997 SHA1 a970c49517e7421db3a238f94feb18b62bda28b2 SHA256 db95e3f8a7bcb9ade0b2b58acdc0591b77eabf223c61c4f99c72a95553b8e53a
-EBUILD libreoffice-9999-r2.ebuild 13389 RMD160 6e4d7d0f1010225abbe6db0830051d3001a30a97 SHA1 d8d8b59986c97614fea6f13b6f25270461c83583 SHA256 481998f3fd625dc9e757728d2c5e8369d44a747ea79e8b259a8db08004371b08
-MISC ChangeLog 36356 RMD160 29ad65970958d11982081a5b1536389063f0924e SHA1 9303e556823c2deddd92d285ee398eb7cedd2f4c SHA256 0d103dffaefebd8158343320671907d89d2f77a31ff54e8446c3805875209f65
+EBUILD libreoffice-9999-r2.ebuild 13391 RMD160 8b7bda0a1c8b7164ec9327edc43479e0acb59ad5 SHA1 1697489fc8640bbd079eb9773dd4a964fa08e582 SHA256 27578dfac643dfdd5e1b8e2f992668f4d1692d2e7c9896374d49b51ad6f32eef
+MISC ChangeLog 36515 RMD160 4537550d1b7d4cb15e19114d10f12b844142303c SHA1 5061cad71f107839095bc3886f24458dc9c138f1 SHA256 209207c6f60ebbdc0e2d2becb8fb231f5f14be401b56191b5e50ffd143068aab
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOvoLMAAoJEOSiRoyO7jvoR2EP/jU627ABZFoBbIix3gjJk4Ft
-wD+W2blLlieVV1cLJyIz7la8GkWI7LD0FT+JPAEe/Rss9lp0+xOC1Ea13iamqNhd
-CzsAEYR74OyvADkytnfXjsq1xhy1E9cVCyhA3pUrBcqz3Ha0xs/eGqA1wQAkUpyV
-oqux+t1N1QnV3AVCU0+U7N5c5Cw1vMYH9ndAi/c+DIQCSQHV7pRrEsC9BB9zQhx/
-DjdqwfL+x6u3mL7SZJIKLbBVTsmNrJl1sh4oHDgWofVskV6QptMtKyb48YiD7YfE
-wKprXQL2OKrh06/Abnnf9U5lBLRaRUmwcb+GhndE+/ihnvcsexohnOquqmE3T6rm
-YmexzSZi0TmdWdc37tQnnO8NJrYOF9Luiuv0ra8fQRQ2Amj3y3cwEDfB6DBwokiR
-YoCXmiBNrao2I7f47XolM7xydODknlQYLTtglGabBih7/EvcODVK6DywICQyrnQO
-JGfyd+3jrUIjkWpPxT3wm72oaGWSIEVyqXR99qiBApj3uM+DWhIDCFSpifwn5LUs
-35vZuf3uRekS+gsagCQDUG8qRZ2wTjsZZZ2YBjKOqk79POKHRYYJrrLHTWrHVgOR
-KwY8o3osc6dKxILADf7EgVKffm6Qf3wALEgbE2ulvXM60xOD9IFYb5bV9IlnwQJ5
-/9WDNls9b7+c3yCjfEdL
-=G1zg
+iQIcBAEBAgAGBQJOvoVZAAoJEOSiRoyO7jvosa0P/R9ETcrxbi+XH/5NeLFwje3t
+981Zo8x4eg6sl7S4vltX7elYiaUGiUVcDzCeucelFdk8J3uOBnwnOEzoAXEeZZzv
+tz7k6QMp/7TfAZMi+LvR93VKGwo0QxbaCXlpZ5k1FoFy4/5ErOdWxq164WJUqbjb
+2In6GKBuGQ0uRTKp9cz8+82iWueTbwJ2INFyGS9Dj1G+dhgBX71Gho2VBwpRhWM9
+NisUct4Tc2vsAlqpTCQt/wVZ/M3pXZaFJ/CMO8Jem6UtMVYvpS/qCPcF+PhX62B2
+R4zbu2sN5o7s8umVKNRTCV10tDiQsEkDkKJ/dfDaPXMcjw0S9VmR/t9JgSMr7ccN
+cDEAW7HTCkgQmN97BGeimzN7qiNNz5/qRGcacvWMuvm3ZHch1Rjm4pVbq3Az39ca
+jt5oaVJlLtmqKVggwlWc3s9RLWsNOC82XyRLc4yYoh8oCon4ANM52qQ0t927V3a0
+2S66ofGmqJbORF59l36X5x9/vtXgVTV/h/Qos1VojcJEy+t6cxbhr++TN8L+oXFa
+wvk704uJNyJAq9pwcwyjD7Fqd1h4Tp6xM3uve1WFPgAnFswCeeSZCWZyjF+Opq3s
+1U84VrjodR0E/Ub1YGnPph3mZ0BoVnVBeAqokmhdlbeSTXQwh4zyxksUZr3kLePA
+QgE6iVd5iPMP9zlESEvu
+=uvFS
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 730718d00a1a84d4db32991af5c8618dbe5211c5..c30fce333de842a0edb6fdbdc5e7f97ddf7e26ec 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/11/12 12:32:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.2 2011/11/12 14:40:30 scarabeus Exp $
 
 EAPI=4
 
@@ -68,8 +68,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
-+jemalloc kde mysql nsplugin odk opengl pdfimport svg test +vba +webdav
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
++jemalloc kde mysql +nsplugin odk opengl pdfimport svg test +vba +webdav
 +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"