Silent bump to ooo-build 3.0.0.3.6, also lots of other build fixes and cleanups, see ChangeLog

for more information
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

7 files changed, 65 insertions, 537 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index fe1b61179ec9..335026334c08 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,25 @@
 # 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.439 2008/11/18 15:56:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.440 2008/12/28 18:40:51 suka Exp $
+
+  28 Dec 2008; Andreas Proschofsky <suka@gentoo.org> -files/gentoo-2.4.1.diff,
+  -openoffice-2.4.1.ebuild, openoffice-3.0.0.ebuild:
+  Bunch of fixes:
+
+  *) Internal Bump to ooo-build 3.0.0.3.6, see
+  http://svn.gnome.org/viewvc/ooo-build/branches/ooo-build-3-0/NEWS?revision
+  =14682&view=markup for more information
+
+  *) Remove dependencies on startup-notification and imagemagick, not needed
+  anymore
+
+  *) Remove hardcoded fonts for some languages, closes bug #252199
+
+  *) Remove some build problems with more strict sandbox, bug #251932
+
+  *) Fix mono install
+
+  *) Remove outdated (and security vulnerable) version
 
   18 Nov 2008; Torsten Veller <tove@gentoo.org> openoffice-2.4.1.ebuild,
   openoffice-3.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 8062e33cdb04..487fcf24771e 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,30 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
-AUX gentoo-3.0.0.diff 3713 RMD160 4ac021c3fc6235ce20d17f0f22c6463906066b76 SHA1 40a0047db6d0140e89201ef2ff4bd129978d0c44 SHA256 331c4a0457e734c8c82eeb41e80df2463914e5285c46a4c97ba44a4f92699ead
+AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49
+AUX gentoo-3.0.0.diff 1740 RMD160 92bba8b79ce15a18a8736c2ceeff65df247eb9ca SHA1 708e9f35dad6c9ed9e22e4c923aa2b887b4ad2bb SHA256 5dc849a7d27e904fe7128819fa97bddc96af7f13888a580081faaaf2747185e3
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 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
-DIST OOo_2.4.1_src_l10n.tar.bz2 81193580 RMD160 d41f43b27e84ae5a4620b591e46d884e0c94a72c SHA1 b21f4531ea8182d87ff6f5f68809086c1c063295 SHA256 7abf85bdf53730d4461376a3e44721763ded5e076fba1739da8c2a64752fe571
-DIST OOo_2.4.1_src_sdk.tar.bz2 38287 RMD160 0b5ef82fd2c2f061f21cabb4db70ccd47f8ff706 SHA1 b29a0e8686f20c3a10e50bd649b95726613ff65b SHA256 e65f72b82bdf639a3c1bba3ab071c8ae7ad7549bc1bdcb269352bfd22fd03d82
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
 DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
 DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5
 DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e14cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
-DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA1 fb7d85a9827cd1280766db2641fb1896bd5d1c7b SHA256 6cf85181c21dadda4fa4d8fbc227012d63a2558642195a46b0ae2ab144facce8
-DIST libwpg-0.1.2.tar.gz 401460 RMD160 9bb39a4b3081277209326c0f553d398c51b4f3bf SHA1 06f4da8fcddaa1987c761f617c41724734e839fa SHA256 1fd363db1debd3f0883b942704809d758f54a3a7d09fc1ddfbd99a1062d4e851
 DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5 SHA1 6d350eb0ad57b97499ef8335506f172b0c21375a SHA256 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
-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.3.5.tar.gz 9720909 RMD160 f387b31c074445d95c9e9a2f663ca4d601e52c6a SHA1 9fc2711a9b09f9cbf646ebde8b00ff8c2c6c4271 SHA256 8d4c88aba568ac6ffd4b8fe2029b990df125552c695ca98cd73314d257515a5e
+DIST ooo-build-3.0.0.3.6.tar.gz 10574055 RMD160 9517a4a7d0ce0557f7a220510598cea493d702c0 SHA1 c00aa4eb426e3897181ecb71ef68d1f19ac6eaa9 SHA256 0ae1d2bbdd7f73f0aa1f6f50e6ea18a4dc6c2baafae9ab3a5715270e2ec8a4da
 DIST ooo300-m9-artwork.tar.bz2 9692435 RMD160 706e568f4af998404d2c2ea2f643f90ccc800ed4 SHA1 92bea75c7f803b11a6aa043990cbc8560d16fcaf SHA256 d181de6723a3b09e9571a22a488fa6b50ea10f19bad7fa91f1ebc2d085a7be58
 DIST ooo300-m9-base.tar.bz2 2937373 RMD160 b0c75fe7b45b56c4e3115112b0f0b59eadd0c136 SHA1 8402f672b817213f98f322ce7e622fbc52865224 SHA256 2c34b6c6229d7b8f87df50d3c4eb16cce1bdbf9af49fa31e688ba9c40e022889
 DIST ooo300-m9-bootstrap.tar.bz2 7020977 RMD160 f5163c83e77c0113ee8d98f20939ab6c7f4f50a2 SHA1 c75b506063415a43c0fe347c900341fe73234a24 SHA256 3b8964bb5d8dd93a038def27a73504416c4320115b92359a0bcd61a53c15e043
@@ -43,18 +32,8 @@ DIST ooo300-m9-sdk.tar.bz2 1612540 RMD160 92a29fdcc10cc6962f7814cc9f7aa58f725478
 DIST ooo300-m9-testing.tar.bz2 1770240 RMD160 56c07b529fed1e7b661fb95b21f26312588cc61e SHA1 a66f762a6b9b24b6c202b0fdcd784d8c4b4beb58 SHA256 aeed10dfc5d62772a2becea749c46a1dccf54f5262af3174b29ee469abffec10
 DIST ooo300-m9-ure.tar.bz2 5263384 RMD160 3a43b0d2b5c79ec54379d4aeac50eef2b2436d71 SHA1 79c438126fb7ec9676ddc45ec079905128db9a34 SHA256 65e4b573e5df271e255fb0073ef9cfa52c107bb6addf2987034dd2b1ed8e6b50
 DIST ooo300-m9-writer.tar.bz2 8364085 RMD160 92ac8eada6e2983e78d1ec02b48791f66a249734 SHA1 0b23415f1173a77fd1598a275f40fecdf152a1ce SHA256 7910b0a2d28945183c27b951952da1d2475d7c121d3f2643c7d26ff62ac0cfe1
-DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
-DIST scsolver.2008-10-07.tar.bz2 230102 RMD160 f14539950ca5bd0c25a37f5f1504460b75eb8890 SHA1 fa267b04ca80d87bcd908e1d99a838208aa2ec29 SHA256 8c2198dd90c49681b47049d56110b5adabd4d301e24e6f358733aa5dbe4b6d6c
+DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 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 12605 RMD160 b6f9b4f840612e8f98c0f9b2d831b339ce38f911 SHA1 d05fc0b8ef21db1995ab1df93d67bce6637d4897 SHA256 282adf8107929946657eb8b5addaa23494dc5b974bfb0b59f16ad039287eb404
-EBUILD openoffice-3.0.0.ebuild 13404 RMD160 42de0cfba095634163bc72d3bf92bfcbdea5c2df SHA1 5e46a3522585b2b6ae1fb8a18437a7e7ebd24db6 SHA256 a92b8da72b7c3ef64fe89bed7b082494383f5ca347eddabcf965b9004a19b304
-MISC ChangeLog 91288 RMD160 ed0c17b06e9750107fb989128db04e71f9eccac8 SHA1 e313309889467ecb9f766635d3bcb44b269c8f3c SHA256 bf582fa060b41d27eb2da3f7b67c4e22e93e48738ce00374d15c1d42b205b33e
+EBUILD openoffice-3.0.0.ebuild 13246 RMD160 db17c5b6458fa2af8c4e173a5b103434d01a4ad9 SHA1 b8ef93ebe473a4eba306f6f963fae2b4d6aefa78 SHA256 7c3490446851576286c351862df22a923d3f06c0c391688ed365f04626634cf1
+MISC ChangeLog 91912 RMD160 2f226787d6e0d14d605ebe53fbfddb553e165dec SHA1 0d3779f50d7ef4fd7ab0cd4aa494399859049e45 SHA256 0b3f28154cc4697417a84965641ddcad18c7894a630fb65f76db16c920d0ad99
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkki5YcACgkQV3J2n04EauwsGQCguHW8R28a00Iad6gUe82oRpPS
-CVUAoL1uXZbAaZNEb20pcPp29k/TvMc1
-=37R9
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/files/fixsandbox.diff b/app-office/openoffice/files/fixsandbox.diff
new file mode 100644
index 000000000000..9249da284baa
--- /dev/null
+++ b/app-office/openoffice/files/fixsandbox.diff
@@ -0,0 +1,11 @@
+--- officecfg/util/makefile.mk 
++++ officecfg/util/makefile.mk 
+@@ -41,7 +41,6 @@
+ 
+ $(MISC)$/$(TARGET)_delzip :
+ 	-$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
+-	-$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
+ 
+ $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
+ 	cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
+
diff --git a/app-office/openoffice/files/gentoo-2.4.1.diff b/app-office/openoffice/files/gentoo-2.4.1.diff
deleted file mode 100644
index 962d2ae9f283..000000000000
--- a/app-office/openoffice/files/gentoo-2.4.1.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- patches/src680/svg-import-filter.diff   2008-04-12 23:55:36.000000000 +0400
-+++ patches/src680/svg-import-filter.diff   2008-03-06 21:09:06.000000000 +0300
-@@ -692,7 +692,7 @@
- +                      $(SLO)$/units.obj
- +
- +.IF "$(COMID)"=="gcc3"
--+.IF "$(CCNUMVER)">="000400000000" 
-++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
- +CFLAGS+=-DUSE_MODERN_SPIRIT
- +.ENDIF
-  .ENDIF
-
diff --git a/app-office/openoffice/files/gentoo-3.0.0.diff b/app-office/openoffice/files/gentoo-3.0.0.diff
index c11b021514d1..e074f3d405f9 100644
--- a/app-office/openoffice/files/gentoo-3.0.0.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0.diff
@@ -8,48 +8,18 @@
  $OOINSTBASE/program/soffice $2 "\$@"
  EOT
      chmod 755 $1
---- distro-configs/CommonLinux.conf.in 
-+++ distro-configs/CommonLinux.conf.in 
-@@ -2,8 +2,6 @@
- --with-openldap
- --with-build-version=\"Build @OOO_BUILDVERSION@\"
- --without-fonts
----with-system-freetype
----with-system-gcc
- --with-system-jpeg
- --with-system-libxml
- --with-system-mozilla
-@@ -14,7 +12,6 @@
- --with-system-poppler
- --with-unix-wrapper=ooffice@OOO_BINSUFFIX@
- --enable-evolution2
----enable-atkbridge
- --with-alloc=system
- --with-vba-package-format=builtin
- @CAIRO_CONFIGURE_FLAG@
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -16,7 +16,7 @@
- --with-system-neon
- --with-system-openssl
- --with-system-vigra
----with-system-xrender-headers
-+--with-system-xrender
- --without-myspell-dicts
- --without-stlport
- --with-vendor=\"Gentoo Foundation\"
 --- patches/dev300/apply 
 +++ patches/dev300/apply 
-@@ -1425,7 +1425,11 @@
+@@ -1458,6 +1458,12 @@
+ [ GentooOnly ]
  SectionOwner => aprosky
  
- # system lucene classpath
--gentoo-system-lucene.diff
-+#gentoo-system-lucene.diff
 +# No java build
 +nojavanostax.diff
 +# Fix freezes with dict|hyph-stuff in one dir
 +hunspell-one-dir-nocrash.diff
++# Sandbox problem with wrong path
++fixsandbox.diff
  # Allow build to proceed with PaX enabled
  gentoo-pax-fix.diff, aprosky
  # support server-only versions of 64bit JDKs
@@ -64,51 +34,22 @@
  +CFLAGS+=-DUSE_MODERN_SPIRIT
  +.ENDIF
   .ENDIF
---- patches/dev300/scp2_extensions.diff 
-+++ patches/dev300/scp2_extensions.diff 
-@@ -370,7 +370,7 @@
- +/* ** SUN Template Pack (en-US)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_en-US
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -385,7 +385,7 @@
- +/* ** SUN Template Pack (de)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_de
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -400,7 +400,7 @@
- +/* ** SUN Template Pack (it)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_it
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -415,7 +415,7 @@
- +/* ** SUN Template Pack (fr)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_fr
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -430,7 +430,7 @@
- +/* ** SUN Template Pack (es)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_es
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
- +    ParentID = gid_Module_Optional_Extensions;
+--- bin/install-mono 
++++ bin/install-mono 
+@@ -32,13 +32,13 @@
+ # to be found in PKG_CONFIG_PATH, though
+ mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
+ sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+-    $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
++    $TOOLSDIR/src/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
+ 
+ # extra dlls config files
+ for dll in cli_uno_bridge.dll ; do
+     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
+ 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+-	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
++	$TOOLSDIR/src/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
+     if test -n "$OODESTDIR" ; then
+ 	file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+ 	echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list
 
diff --git a/app-office/openoffice/openoffice-2.4.1.ebuild b/app-office/openoffice/openoffice-2.4.1.ebuild
deleted file mode 100644
index 6a25333a74ee..000000000000
--- a/app-office/openoffice/openoffice-2.4.1.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# 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-2.4.1.ebuild,v 1.9 2008/11/18 15:56:04 tove 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"
-
-MY_PV="2.4.1.8"
-PATCHLEVEL="OOH680"
-SRC="OOo_${PV}_src"
-MST="OOH680_m17"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
-	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
-	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
-		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	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.10_source.tar.gz
-	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/libwpg-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/oox.2008-02-29.tar.bz2
-	http://download.go-oo.org/SRC680/writerfilter.2008-02-29.tar.bz2"
-
-LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh sk sl sr ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
-done
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-COMMON_DEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	>=dev-lang/perl-5.0
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10
-		>=x11-libs/cairo-1.0.2 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( =kde-base/kdelibs-3* )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-java/xalan-2.7
-		>=dev-java/xalan-serializer-2.7
-		>=dev-java/xerces-2.7
-		=dev-java/xml-commons-external-1.3*
-		>=dev-db/hsqldb-1.8.0.9
-		=dev-java/rhino-1.5* )
-	mono? ( >=dev-lang/mono-1.2.3.1 )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	xulrunner? ( >=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*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) ) )
-	>=net-misc/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	media-libs/jpeg
-	media-libs/libpng
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	>=app-admin/eselect-oodict-20060706
-	dev-libs/expat
-	>=dev-libs/icu-3.8
-	>=sys-libs/db-4.3
-	>=app-text/libwpd-0.8.8
-	>=media-libs/libsvg-0.1.4
-	>=media-libs/vigra-1.4
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	!xulrunner? ( firefox? ( || ( =www-client/mozilla-firefox-2*
-		=www-client/mozilla-firefox-bin-2* ) ) )
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	virtual/perl-Compress-Zlib
-	>=virtual/perl-Compress-Raw-Zlib-2.002
-	virtual/perl-IO-Compress-Base
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	sys-devel/flex
-	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
-	sys-apps/coreutils
-	media-gfx/imagemagick
-	pam? ( sys-libs/pam )
-	!dev-util/dmake
-	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-		dev-java/ant-core )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	ewarn
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS_OOO="en-US"
-		ewarn
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO=`echo ${LINGUAS} | \
-			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
-		ewarn
-	fi
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the openoffice build will break. "
-		die
-	fi
-
-	if use pam; then
-		if ! built_with_use sys-apps/shadow pam; then
-			eerror " shadow needs to be built with pam-support. "
-			eerror " rebuild it accordingly or remove the pam use-flag "
-			die
-		fi
-	fi
-
-	if use xulrunner; 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!"
-		fi
-	fi
-
-	# Check python
-	if ! built_with_use dev-lang/python threads
-	then
-	    eerror "Python needs to be built with threads."
-	    die
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	# Hackish workaround for overlong path problem, see bug #130837
-	mv "${S_OLD}" "${S}" || die
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
-	epatch "${FILESDIR}/ooo-env_log.diff"
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-xalan" >> ${CONFFILE}
-		echo "--with-system-xerces" >> ${CONFFILE}
-		echo "--with-system-xml-apis" >> ${CONFFILE}
-		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-serializer-jar=$(java-pkg_getjar xalan-serializer serializer.jar)" >> ${CONFFILE}
-		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
-		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
-		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
-		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
-	fi
-
-	if use firefox || use seamonkey || use xulrunner ; then
-		echo "--enable-mozilla" >> ${CONFFILE}
-		local browser
-		use seamonkey && browser="seamonkey"
-		use firefox && browser="firefox"
-		use xulrunner && browser="${XULR}"
-
-		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
-	else
-		echo "--disable-mozilla" >> ${CONFFILE}
-		echo "--without-system-mozilla" >> ${CONFFILE}
-	fi
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-	echo "`use_enable cups`" >> ${CONFFILE}
-	echo "`use_enable dbus`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
-	echo "`use_enable gstreamer`" >> ${CONFFILE}
-	echo "`use_enable ldap`" >> ${CONFFILE}
-	echo "`use_enable opengl`" >> ${CONFFILE}
-	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "--enable-neon" >> ${CONFFILE}
-	echo "--with-system-neon" >> ${CONFFILE}
-	echo "--with-system-openssl" >> ${CONFFILE}
-
-	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
-
-}
-
-src_compile() {
-
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	export JOBS="1"
-	if [[ "${WANT_MP}" == "true" ]]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	fi
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-	filter-flags "-O[s2-9]"
-
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
-
-	cd "${S}"
-	./configure \
-		--with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--host="${CHOST}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="${MST}" \
-		${GTKFLAG} \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable pam` \
-		`use_enable !debug strip` \
-		`use_enable odk` \
-		`use_with java` \
-		--disable-access \
-		--disable-post-install-scripts \
-		--enable-hunspell \
-		--enable-openxml \
-		--with-system-hunspell \
-		--with-system-libwpd \
-		--with-system-libsvg \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-	einfo "Building OpenOffice.org..."
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-	chown -R root:0 "${D}"
-
-	# record java libraries
-	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
-
-}
-
-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/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
-	# Add available & useful jars to openoffice classpath
-	use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	elog " To start OpenOffice.org, run:"
-	elog
-	elog " $ ooffice"
-	elog
-	elog " Also, for individual components, you can use any of:"
-	elog
-	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
-	elog " ooweb or oowriter"
-	elog
-	elog " Spell checking is now provided through our own myspell-ebuilds, "
-	elog " if you want to use it, please install the correct myspell package "
-	elog " according to your language needs. "
-
-}
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index c4c5da113405..287211a0e278 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.18 2008/11/18 15:56:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.19 2008/12/28 18:40:51 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -10,7 +10,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV="3.0.0.3.5"
+MY_PV="3.0.0.3.6"
 PATCHLEVEL="OOO300"
 SRC="OOo_${PV}_src"
 MST="ooo300-m9"
@@ -48,7 +48,7 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2
 	http://download.go-oo.org/SRC680/extras-3.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-10-07.tar.bz2
+	http://download.go-oo.org/DEV300/scsolver.2008-10-30.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"
 
@@ -87,7 +87,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 		virtual/glu )
 	>=net-misc/neon-0.24.7
 	>=dev-libs/openssl-0.9.8g
-	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.3.0
 	cups? ( net-print/cups )
@@ -101,10 +100,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	>=sys-libs/db-4.3
 	>=app-text/libwpd-0.8.8
 	>=media-libs/vigra-1.4
-	>=app-text/poppler-0.8.0
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+	>=app-text/poppler-0.8.0"
 
 RDEPEND="java? ( >=virtual/jre-1.5 )
 	${COMMON_DEPEND}"
@@ -132,7 +128,6 @@ DEPEND="${COMMON_DEPEND}
 	>=net-misc/curl-7.12
 	sys-libs/zlib
 	sys-apps/coreutils
-	media-gfx/imagemagick
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
@@ -266,6 +261,7 @@ src_unpack() {
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die
 	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die
+	cp -f "${FILESDIR}/fixsandbox.diff" "${S}/patches/dev300" || die
 
 	#Use flag checks
 	if use java ; then
@@ -384,7 +380,7 @@ src_install() {
 	make DESTDIR="${D}" install || die "Installation failed!"
 
 	# Fix the permissions for security reasons
-	chown -R root:0 "${D}"
+#	chown -RP root:0 "${D}"
 
 	# record java libraries
 	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/basis3.0/program/classes/*.jar