First release candidate for OpenOffice 3.0

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 51 insertions, 51 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 658e9f299b97..53e4d9525da4 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.411 2008/08/22 13:26:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.412 2008/09/11 12:37:30 suka Exp $
+
+*openoffice-3.0.0_rc1 (11 Sep 2008)
+
+  11 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/gentoo-3.0.0_beta2.diff, +files/gentoo-3.0.0_rc1.diff,
+  -openoffice-3.0.0_beta2.ebuild, +openoffice-3.0.0_rc1.ebuild:
+  Release Candidate 1 for OOo 3.0. Also use nsplugin instead of
+  firefox|xulrunner use-flags.
 
   22 Aug 2008; Andreas Proschofsky <suka@gentoo.org>
   +files/gentoo-3.0.0_beta2.diff:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a1f4e0e85ee4..f63f0bb54e8d 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,5 @@
 AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
-AUX gentoo-3.0.0_beta2.diff 1217 RMD160 e29fb6742516f9c22fed4c4949fbf8cefb3e225b SHA1 d7ca7b250c2fd710b7086fe856d6f7ad938b9d2c SHA256 aedfb944a2ca0ced04165d73727991e81168787d479166c7c0d601d90f5c16b2
+AUX gentoo-3.0.0_rc1.diff 1211 RMD160 82ee44ff3765eb1af0cecf9902e05f10680b2e5d SHA1 bebc825923c5dcc4fe3d3f4dd49d35aa2b857c1f SHA256 7d47e50d20498084b59d4cb1cf61caa0838d08ed2983e5f08e2fc9042d7aab36
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST OOo_2.4.1_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390
 DIST OOo_2.4.1_src_core.tar.bz2 153573457 RMD160 64f43d426005b6c5f464cf55e72df41fe833620b SHA1 170642263c32f614ee7e9439a8af30410e00d318 SHA256 abf576f3d451a981887c2a1985b2b72724af204491da6407a1c6e3b0baa10590
@@ -13,30 +13,30 @@ DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST ooo-build-2.4.1.8.tar.gz 8867690 RMD160 5e451495bf8454cc40b8a30a43e2de63af88afff SHA1 bfdf798dc82e14b9ae8bae304fe3255852d1cd23 SHA256 d1220bfab1ed484cc1be77bc189b14821286d64709f147137d6431efe7899c88
-DIST ooo-build-3.0.0.1.tar.gz 9141109 RMD160 79591481a46f244b72b0096254bade284d5162e5 SHA1 f4e50d43064f045ef8acaa970e41a48918187e96 SHA256 efd31dff8ebfbaaa5b84d8d1804211020369987c96e176e1ba9752e3c45ac43b
-DIST ooo300-m3-artwork.tar.bz2 9553655 RMD160 0aaf1d7809a5d102f76a609b7f5bcdf2297d322e SHA1 10111a097e1376e72797e9f4de78e477b2b00e92 SHA256 de1d0e4de90a0206f72ee8ed447bbfbcf7637148b5d692c693a4221cba8b03b0
-DIST ooo300-m3-base.tar.bz2 3036753 RMD160 604bf21c1a1a6fcfa447dad3b7b38946c62a203f SHA1 12600173894f70e8e89a9ad9ae3426b1cb7f9ea9 SHA256 0eea140e2f5b9466448702946acf216e9ce3ee221f84d8f5040037e6ca638921
-DIST ooo300-m3-bootstrap.tar.bz2 7017164 RMD160 233a7b653e0583e1e1c0428dbf0bbb2778afe69f SHA1 dabf54da9a1b494ec8dbda7f7d07689fce400e07 SHA256 48bfba2d5d87d51e67ba7be142eef75c90db3bad3b6eb80034819b21515f0691
-DIST ooo300-m3-calc.tar.bz2 8669720 RMD160 0ccdde5e12196ca09e99b4580856c8fb0183c0b6 SHA1 28fbb04615148d705c7b71e85a4a8b860a891812 SHA256 b64799b8e278a1cb3ff22b6be11b33849cbd089b09b82af7077a2ada2d08732b
-DIST ooo300-m3-components.tar.bz2 5555886 RMD160 2d78a387791d6eeed146e9ed9c352528f2cffb66 SHA1 41ce1a0489d13cb4318fc177ff1634f21aebe207 SHA256 d84df013d1fe12921c79c60025f801096d94a954352686b1355125b8cb2e1d83
-DIST ooo300-m3-filters.tar.bz2 10975791 RMD160 597cbac9fc834265a00ea8818e3e379f7a4fa610 SHA1 ad49f76f654cfee92a8698a5b6072c01d2b616cc SHA256 e93e847a40f69a359f327653c8c444e73b42924b6485cbb19093026debef5f2d
-DIST ooo300-m3-impress.tar.bz2 4027926 RMD160 05d19600056102db90ec752e1814d2258f3c079d SHA1 85fd99ca494c1da057435ff5192fec1757e030e7 SHA256 10312fef2704a765cf1b0a201490c7acafcb5bb64188e89728b2f796941d27c1
-DIST ooo300-m3-l10n.tar.bz2 71183403 RMD160 cb36f669c06aee67b7d06781b65dbe34dcc5840c SHA1 220cdff7ce2ba324902f67bae9ba13dac93311bc SHA256 6aad55a587ef882a54401e50a3259d603aaa2a13cfd0624f9b1b4974efd0ea3e
-DIST ooo300-m3-libs_core.tar.bz2 23831683 RMD160 be04552898bedf9e48a1e509759c46ea3a95e523 SHA1 a3fe0032f52f8b7c4dd1f39fa5c043654e1722f7 SHA256 c0740e178b05fc311bcb7c85c5d4533adbf8ac83a9d89f4da8090aed382b360f
-DIST ooo300-m3-libs_extern.tar.bz2 45447993 RMD160 f3eecbc407d5d99cbfd72c71d1c1d928c369206d SHA1 a9cb31905fe32a0e89eed02cd6a45485c0689428 SHA256 c91b3c5fcaa989f771e858362689c61c74c585da7030350744c72df89dce9fe1
-DIST ooo300-m3-libs_extern_sys.tar.bz2 94520756 RMD160 ca7bc7fd5adf413a95d265e3687d669f07efd020 SHA1 4bb0c438412015dbdc981686bbbbf2c19877e1a4 SHA256 9330a5874189efc26c5e4717b9f109aea6664af11a3d99c875423d5dc9d8b10a
-DIST ooo300-m3-libs_gui.tar.bz2 11156634 RMD160 7e95842dd4bc2e8393e4b7a2c43ec6dec9b4730d SHA1 85077cc7dd3bad7d0ab901ecbd6e38c58b5476bb SHA256 a138f2607afe021cae369ec53f4786559ce188ae79354349f7971d009bf1a2b8
-DIST ooo300-m3-postprocess.tar.bz2 17432 RMD160 1c988b6be3733c4d1c0f27b7a878d252d492f63d SHA1 85646c9179403d63045ca1c525625b5b1a9ca7fc SHA256 3b6ab5b4416d28ea6d550e622197ef053c33ba5279dd0e8d5e0ee5f0b4ae5b2c
-DIST ooo300-m3-sdk.tar.bz2 1612333 RMD160 a9ffe23ef4cebb9544f7ee75a9e6981f7bf919cb SHA1 5714898a410a2c0cf6c6f8275076ae05306e858c SHA256 ce9d74f892f2d93bd6f5756178b9939be09fa9a8cde74cf97db9e7a136acc20d
-DIST ooo300-m3-swext.tar.bz2 6962332 RMD160 dc08491f43c0a13d2337382c20ce3aca0479ebdd SHA1 8364b5cb8bea73ac3915bb7a25b6a6393ff4d68b SHA256 3d91a7e6c77123a0c3138fa00a8b728ece088c3b12bb3c20d7d13795a70f2da6
-DIST ooo300-m3-testing.tar.bz2 1771526 RMD160 0bf2b15ade02dc7049c6d5b23947bb1f08a2e61a SHA1 26a1646fac8b98ac35df844ef97367134231ac46 SHA256 f6a39d2b80dff4887baa8f6e340019dffd284d8af0f844e12aae65fa3b969cf8
-DIST ooo300-m3-ure.tar.bz2 5261770 RMD160 381bba14f8219b5d9cc4bcb193c4c0c646223e54 SHA1 733811f5990227518c790d398299e544ef2cb383 SHA256 61c34750321eb8193955438f73332477eef245a30a6e2b4ab614c0807120b946
-DIST ooo300-m3-writer.tar.bz2 8333682 RMD160 5912864664c2097b71660c548beeaf1993041dba SHA1 cb74f83e584c38fdd768c4a3f10da3cafb2aa11d SHA256 6e8bc3e006f04eec8cd27f0d8b70c8580f140881c716099459819b036aeafa29
+DIST ooo-build-3.0.0.3.1.tar.gz 9390057 RMD160 9ff120a82746c712df7afa423a4e04217cc8e28b SHA1 ced2327d8b30fd0a16e94c56bac4b3a8b45d293a SHA256 de4c312b58be7d1b26bedf71f5a5072347bba408e69d7b19d4202e9f2b794144
+DIST ooo300-m5-artwork.tar.bz2 9690746 RMD160 dd7297e0240105491f32b505ef6849544c22476d SHA1 2d8b05c15ee40d0e742a02e62d89b808e0ced591 SHA256 930cb66d25a6f4f16e214719bbfe48277d96093d672e081ba0dfb8affe3a1bcf
+DIST ooo300-m5-base.tar.bz2 2936588 RMD160 77cc3c4e05c773852e1202af37d11bf0a72ab8e8 SHA1 dc02b64def11ff071961f5031ec0ef71f85ae505 SHA256 1bf0f7fa32df2a5b68924f17eabdd80fefce4ad69038a0a17ef40ecc9b3d9360
+DIST ooo300-m5-bootstrap.tar.bz2 7018466 RMD160 3d01e385c28d6eab7a8e155d5ff3af18b7eb251f SHA1 d631fca31266856dd09c433012331ada7d63b9c6 SHA256 943972845a8d04b78b0d53b7e0e4543ab5ad38b934a9f6f14e2384cf2d533728
+DIST ooo300-m5-calc.tar.bz2 8694231 RMD160 8ce948a4cb68e7818355146e7f2a01f354151922 SHA1 bae481ec50fbacc89311f370ddfed16b3f1bedc7 SHA256 87d0724676d687265fbfd0fa473e3300f92acbfdb299fc1dc54cfb391a61637f
+DIST ooo300-m5-components.tar.bz2 5560661 RMD160 a70d29f8f7d411fd2a40dded9f818dcf7ddb7f90 SHA1 268fdcaaeb625dfa30c5898375d779bd376e4869 SHA256 5b0687bbc23b196ed1aeb6eec4ab8fa6ad2222e3c3b31806c83a43882103f232
+DIST ooo300-m5-filters.tar.bz2 10977460 RMD160 a290ec0a14f25d9bd32528fe4ce17d020eb310d6 SHA1 b6f3dabff2bc376b4d0c99cb2522aa27f1bb1d61 SHA256 5e4ab5c4b95c8999ff58c96d308fdba2faa1a177a72052c0652a14ab1dcff32d
+DIST ooo300-m5-impress.tar.bz2 4049333 RMD160 59a41abc985ae33ec7548afd8e42fc7d0d896510 SHA1 004d2971193a7f383b752b635cb97ad23687ea6e SHA256 1dbedbc40db3688dc7d8033789a1aa8413912b9b35abbc39898f004e0d2e7b92
+DIST ooo300-m5-l10n.tar.bz2 86609171 RMD160 f1807188f42338012ee717b952341eced4fec67f SHA1 a342451c504fae932b835864a0b46ad8d9b2ae0d SHA256 3f06d4695c943701ae416c64d2834cab25b96a583271f0519c8f93ca8052fef1
+DIST ooo300-m5-libs_core.tar.bz2 23860477 RMD160 f6b8465d9ce8ad878481da7e01d4054eaf77c932 SHA1 4951d30fb5edf0895fe2d7b66b79671a1349bf47 SHA256 47bf068dfe708273d26bceee5b0d01b07f0846a92b35b177272df92f15fac76d
+DIST ooo300-m5-libs_extern.tar.bz2 45449136 RMD160 c02784656b933546fe40f82d3de68a3272c8eca9 SHA1 f82903dc7befb4b7f0c66c4ac8e6b0ed50405de0 SHA256 2883d414af27bb5ee1b5cc6e6d95ef7b8a80a95cf5845682364137cc195bc449
+DIST ooo300-m5-libs_extern_sys.tar.bz2 94519911 RMD160 90d42a6854ebcbf93f28bd409db3d4d1468c74a4 SHA1 e02e2d965de3b63122cc0d951a1fa1e9abf59f34 SHA256 294978b7048f454b791c55d418afcdeb56581c5be8f33b01717812e1032a7646
+DIST ooo300-m5-libs_gui.tar.bz2 11163549 RMD160 608090f58aa02a900b36b2fb7198fc15fb8a6b18 SHA1 07069d795818bce97638ef54a70dbbdd49fd10fe SHA256 ad66224ec9c5b90f1b38c0a90dd89c00b843e3fc37a4e7e3e1560805e89a5406
+DIST ooo300-m5-postprocess.tar.bz2 17414 RMD160 1f37e3ef6abc5aad57eb211cbb2867da55823b4d SHA1 d64cfbea12a2ed289108cb591f2d29e7ab570bba SHA256 29c69e8f55b951ac8b126816bc469fbbaa8fec3cfef772b98341450a784c7282
+DIST ooo300-m5-sdk.tar.bz2 1612166 RMD160 64c6f8ee66ce345b655d989cce04418928dff04a SHA1 ec50a268b2bc69cf692de70603a1d4de4ad05ba9 SHA256 d93141346e5c016404aa5741e6f8a721c37c3d46ea1dd1577b9cfd558aff9a19
+DIST ooo300-m5-swext.tar.bz2 6964775 RMD160 bf1083a6d1bb9254f53d54592840c4549e000917 SHA1 3a3069caa7dbce86f8c3ea820918688d7a6dca06 SHA256 c2dceeadf7918651a95a685210bc9f503f3be204216cbd7545af572be8959a0d
+DIST ooo300-m5-testing.tar.bz2 1770828 RMD160 5adbd9eda7a1ab3e47fb518caa4f8ed84709b622 SHA1 e431ead6b397558903d702f8884c041815bf8f47 SHA256 5d9a3a7d0deec2fe7ecbf21b0bfb1fed254fd40e2d726f53ec5f3ab4ce77b5f9
+DIST ooo300-m5-ure.tar.bz2 5261358 RMD160 f9030f054f1879fd5ccc191c540f46ec15d861fc SHA1 fdad9cefbea04522987325c036a1c889f7b8366e SHA256 8b28a6156143636f0efcf22993f51d66d016c65178ec493510fb98e17dc73cf2
+DIST ooo300-m5-writer.tar.bz2 8362222 RMD160 cca8b3b4fcec26f14e74d6b35fc4432c5d65b3b3 SHA1 648750d045e5aebe153c33d8afddd3bffa7fc3b0 SHA256 9628459939868a48a17e3d75e962e9e1e783fd5acee70b7ad40bbdd7044a39e7
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
-DIST scsolver.2008-08-20.tar.bz2 181439 RMD160 b26af3eaaf548370cb8d1a1e21ec2b38e1fc19f3 SHA1 f92722fe09db1f386eb9c2bbfbc886b122965f79 SHA256 5e2ca25eeb1a319588c2484364cba035e16af7e086b0e2c9a08f87c3e3fcf931
+DIST scsolver.2008-09-08.tar.bz2 217228 RMD160 ce72548a6743a58d2306a3ae99443136dd7c731f SHA1 9d8a87c4ab2ee656239cb54ddfefe45e4cace613 SHA256 38a4a1ebda8a6d4f2607e15c77a3ccd1e4c8abe8ba7266a617feff7fd337c724
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8
-EBUILD openoffice-3.0.0_beta2.ebuild 12662 RMD160 9c6b69af1e07375f5c0c19430fb9ecea53956e7f SHA1 d7ed6cd0c643014a812893577eb7af51067eb290 SHA256 6492ebe649619292e78518f21995f82357e2a9f8abf4decb47c2caa268b63dbd
-MISC ChangeLog 85281 RMD160 e4a6931433b71a17d4e9ecd90a41608f63405f1c SHA1 f930fdb09ca05e53becaf912c19dece3bbce4c7f SHA256 9196e077b62dfacae643f9d02b5c12bf6aeb6fa55744ae9b393c7feac529043a
+EBUILD openoffice-3.0.0_rc1.ebuild 12290 RMD160 c61c71cdacd654e041c0fd90de7959569cdb685f SHA1 7255175c9d5addaa9bd50a75527a7391f1ad5f0b SHA256 94553ddea6f5682176f68d8cc05e5f9b8d3dc599a1f6357f8e26da312b9591c8
+MISC ChangeLog 85595 RMD160 071f08f18f646c98d1b4ebb7d67ba352ca47772b SHA1 1c77cfe1a704d4098efc6092ba26abcc21d7232f SHA256 f77a81947f66bd9910bdbc6d55888c07d4e1fbc471870815e67403d86c8a93ff
 MISC metadata.xml 635 RMD160 b0b38a6072b2c813ab06e217cd7df90065bd9123 SHA1 8d0686f133cdb62b23b95e837c40b0dad12f5a41 SHA256 3415df8f17c3868078747c22ea1105bb0a2a1444d577214b81fd05cc2fac604f
diff --git a/app-office/openoffice/files/gentoo-3.0.0_beta2.diff b/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
index 3328caedc70f..5d4d32b54601 100644
--- a/app-office/openoffice/files/gentoo-3.0.0_beta2.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
@@ -12,8 +12,8 @@
 +++ patches/dev300/apply 
 @@ -1375,12 +1375,8 @@
  system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
+ # User ~/.ooo3 as user dir
+ scp2-user-config-ooo3.diff, pmladek
 -# unused java code
 -disable-parser-jaxp.diff
  # default inc/lib
diff --git a/app-office/openoffice/openoffice-3.0.0_beta2.ebuild b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild
index 6bc43caa926f..57f08b5a8a4d 100644
--- a/app-office/openoffice/openoffice-3.0.0_beta2.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_beta2.ebuild,v 1.1 2008/08/22 13:26:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc1.ebuild,v 1.1 2008/09/11 12:37:30 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
 
-IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk opengl pam seamonkey xulrunner"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam seamonkey"
 
-MY_PV="3.0.0.1"
+MY_PV="3.0.0.3.1"
 PATCHLEVEL="OOO300"
 SRC="OOo_${PV}_src"
-MST="ooo300-m3"
+MST="ooo300-m5"
 DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
@@ -42,7 +42,7 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2
 	http://download.go-oo.org/SRC680/extras-2.tar.bz2
 	http://download.go-oo.org/SRC680/biblio.tar.bz2
 	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
-	http://download.go-oo.org/DEV300/scsolver.2008-08-20.tar.bz2
+	http://download.go-oo.org/DEV300/scsolver.2008-09-08.tar.bz2
 	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
 	http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
 
@@ -61,7 +61,7 @@ HOMEPAGE="http://go-oo.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 COMMON_DEPEND="!app-office/openoffice-bin
 	x11-libs/libXaw
@@ -88,14 +88,12 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	mono? ( >=dev-lang/mono-1.2.3.1 )
 	opengl? ( virtual/opengl
 		virtual/glu )
-	xulrunner? ( >=net-libs/xulrunner-1.8
+	!seamonkey? ( nsplugin? ( >=net-libs/xulrunner-1.8
 		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	!xulrunner? ( firefox? ( >=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1*
+	seamonkey? ( =www-client/seamonkey-1*
 		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) ) )
+		>=dev-libs/nss-3.11-r1 )
 	>=net-misc/neon-0.24.7
 	>=dev-libs/openssl-0.9.8g
 	>=x11-libs/startup-notification-0.5
@@ -119,8 +117,9 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 RDEPEND="java? ( >=virtual/jre-1.5 )
-	!xulrunner? ( firefox? ( || ( =www-client/mozilla-firefox-2*
-		=www-client/mozilla-firefox-bin-2* ) ) )
+	nsplugin? ( || ( >=www-client/mozilla-firefox-2
+		>=www-client/mozilla-firefox-bin-2
+		=www-client/seamonkey-1* ) )
 	${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
@@ -141,7 +140,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/bison
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.0
-	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
 	>=dev-util/gperf-3
 	>=net-misc/curl-7.12
 	sys-libs/zlib
@@ -151,7 +149,7 @@ DEPEND="${COMMON_DEPEND}
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
 	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
-		dev-java/ant-core )
+		>=dev-java/ant-core-1.7 )
 	ldap? ( net-nds/openldap )"
 
 PROVIDE="virtual/ooo"
@@ -211,13 +209,13 @@ pkg_setup() {
 		fi
 	fi
 
-	if use xulrunner; then
+	if use !seamonkey && use nsplugin; then
 		if pkg-config --exists xulrunner-xpcom; then
 			XULR="xulrunner"
 		elif pkg-config --exists libxul; then
 			XULR="libxul"
 		else
-			die "USE flag [xulrunner] set but not found!"
+			die "USE flag [nsplugin] set but no installed xulrunner found!"
 		fi
 	fi
 
@@ -267,12 +265,11 @@ src_unpack() {
 		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 	fi
 
-	if use firefox || use seamonkey || use xulrunner ; then
+	if use nsplugin || use seamonkey ; then
 		echo "--enable-mozilla" >> ${CONFFILE}
 		local browser
+		use nsplugin && browser="${XULR}"
 		use seamonkey && browser="seamonkey"
-		use firefox && browser="firefox"
-		use xulrunner && browser="${XULR}"
 
 		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
 	else
@@ -296,9 +293,6 @@ src_unpack() {
 
 	echo "`use_enable debug crashdump`" >> ${CONFFILE}
 
-	# Original branding results in black splash screens for some, so forcing ours
-#	echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
-
 	eautoreconf
 
 }
@@ -379,8 +373,6 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 
-#	eselect oodict update --libdir $(get_libdir)
-
 	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/basis3.0/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/basis3.0/program/soffice.bin
 
 	# Add available & useful jars to openoffice classpath