Update to newer ooo-build-snapshot

Package-Manager: portage-2.1.3.9

6 files changed, 57 insertions, 106 deletions

diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 91c6597e98d7..d8cfe03b2628 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.2.1/50-openoffice-bin 61 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 SHA1 01535195f88aee1cfaefc46fc5675693345267d2 SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde
 MD5 bfd1ef5874ad7c444562c1d2e58ee808 files/2.2.1/50-openoffice-bin 61
 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 files/2.2.1/50-openoffice-bin 61
@@ -161,14 +164,14 @@ EBUILD openoffice-bin-2.2.1.ebuild 5437 RMD160 eea707f49128cb98b27403052ed978412
 MD5 2a769fd38c4881978852e4ac1d074807 openoffice-bin-2.2.1.ebuild 5437
 RMD160 eea707f49128cb98b27403052ed9784127adce30 openoffice-bin-2.2.1.ebuild 5437
 SHA256 1b61e6e346db4b421060395c3fff74d7fedc1f809bd9ef677f29c25c8a30c3b9 openoffice-bin-2.2.1.ebuild 5437
-EBUILD openoffice-bin-2.3.0.ebuild 5401 RMD160 83d09695a105201c80a4f221678ceed3b1ec8077 SHA1 961b20c74d2ae107a9eee5a0c29577d5cea6cefc SHA256 4bc1f3fb721eb5f8109638e34df3fd3264cb4ad575abd3fa989c18eec6ba3487
-MD5 d6d65bdc17011979ab9fab8600e407dd openoffice-bin-2.3.0.ebuild 5401
-RMD160 83d09695a105201c80a4f221678ceed3b1ec8077 openoffice-bin-2.3.0.ebuild 5401
-SHA256 4bc1f3fb721eb5f8109638e34df3fd3264cb4ad575abd3fa989c18eec6ba3487 openoffice-bin-2.3.0.ebuild 5401
-MISC ChangeLog 32369 RMD160 8ccbf3218a888cca2f3c775fbfa567b6ca756480 SHA1 983b2d490859fb1fd1a5f963697259a44d698527 SHA256 f85e22f189dffcfa76e639cac2e909e7db2cf78c52089f19187edb91b6f295dc
-MD5 040d62cb6fccf8387f355ab04e8d9222 ChangeLog 32369
-RMD160 8ccbf3218a888cca2f3c775fbfa567b6ca756480 ChangeLog 32369
-SHA256 f85e22f189dffcfa76e639cac2e909e7db2cf78c52089f19187edb91b6f295dc ChangeLog 32369
+EBUILD openoffice-bin-2.3.0.ebuild 5403 RMD160 770d6f77bbcd0d4e5836ad307ec7b54e721da5a9 SHA1 82f131998efa51f573799777af0a95073bdd857e SHA256 d3c0ea80eca9814be4e35274f70c83c4ae3edb451eac649e515034750c6c729c
+MD5 bbf4238e13d328007e0ef93d05699726 openoffice-bin-2.3.0.ebuild 5403
+RMD160 770d6f77bbcd0d4e5836ad307ec7b54e721da5a9 openoffice-bin-2.3.0.ebuild 5403
+SHA256 d3c0ea80eca9814be4e35274f70c83c4ae3edb451eac649e515034750c6c729c openoffice-bin-2.3.0.ebuild 5403
+MISC ChangeLog 32499 RMD160 ff475db8744d1efffff27ae8579a669665245c72 SHA1 6539de9deacee90341b346e1a66497972fa3adfd SHA256 10f3fc2839b6d5baa11d8c2aacd1c10476a32a8aeaa971d76ef50d6f9bc0c350
+MD5 1b71265cd1594d3bd5308304913791fa ChangeLog 32499
+RMD160 ff475db8744d1efffff27ae8579a669665245c72 ChangeLog 32499
+SHA256 10f3fc2839b6d5baa11d8c2aacd1c10476a32a8aeaa971d76ef50d6f9bc0c350 ChangeLog 32499
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460
@@ -179,3 +182,10 @@ SHA256 a7d5259b422be741baad6355d51f6197e9dc18ea5be6c8eb6d99cbe1ab92398b files/di
 MD5 d7a3f9d40d1a74007196188ae60e58e4 files/digest-openoffice-bin-2.3.0 23586
 RMD160 e449bbd31f0825739c9e4edb591a348d19dfddb0 files/digest-openoffice-bin-2.3.0 23586
 SHA256 81201217c98a672d97e37a23e7107dc5d4cfbd8d09ef5df82dd77246a386be17 files/digest-openoffice-bin-2.3.0 23586
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG77ZwKhnDs22gwa8RAswDAJ9ljdRI7iiN+n/sd1g8WeywgW+ncQCgmk4y
+m4v5IdwyPFv0cNPPR3SX7Bg=
+=l4k7
+-----END PGP SIGNATURE-----
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4ef394b74b84..054caecfcbdb 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.337 2007/09/18 07:27:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.338 2007/09/18 11:23:58 suka Exp $
+
+  18 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.3.0/gentoo-2.3.0.diff, openoffice-2.3.0.ebuild:
+  Update to newer ooo-build-snapshot. This fixes the problem of the wrong
+  version number on the splash, but mostly brings a few patches upstream.
 
 *openoffice-2.3.0 (18 Sep 2007)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 92995d29d7ee..bceca15abede 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -30,10 +30,10 @@ AUX 2.3.0/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fff
 MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.3.0/disable-regcomp-python.diff 934
 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.3.0/disable-regcomp-python.diff 934
 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.3.0/disable-regcomp-python.diff 934
-AUX 2.3.0/gentoo-2.3.0.diff 2653 RMD160 a8152ba7403904752d9c9155b301733ac37ec16e SHA1 88c19dee13cc065e82e02110f1436d7493c9c4a7 SHA256 3045427fa441d285a3fa5e7a620fc4394884414fdbb21e65abadd0c0b2c513eb
-MD5 bbfe3426dee547b8f48e008e488fb788 files/2.3.0/gentoo-2.3.0.diff 2653
-RMD160 a8152ba7403904752d9c9155b301733ac37ec16e files/2.3.0/gentoo-2.3.0.diff 2653
-SHA256 3045427fa441d285a3fa5e7a620fc4394884414fdbb21e65abadd0c0b2c513eb files/2.3.0/gentoo-2.3.0.diff 2653
+AUX 2.3.0/gentoo-2.3.0.diff 709 RMD160 881ac1dfdd5783159d5d1cc0d0d2ca64d8e682e3 SHA1 ea702c2c55fb964631d70ebf67e56a38e209812e SHA256 dce23719822b32212af7ae2647dcba5ebcbebab391441956103af0e62c365ae9
+MD5 9090123a2e7cc35a4e04fe2142e64f93 files/2.3.0/gentoo-2.3.0.diff 709
+RMD160 881ac1dfdd5783159d5d1cc0d0d2ca64d8e682e3 files/2.3.0/gentoo-2.3.0.diff 709
+SHA256 dce23719822b32212af7ae2647dcba5ebcbebab391441956103af0e62c365ae9 files/2.3.0/gentoo-2.3.0.diff 709
 AUX 2.3.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 MD5 1f836c5ae6bd978035358290c001c579 files/2.3.0/ooo-env_log.diff 617
 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.3.0/ooo-env_log.diff 617
@@ -64,7 +64,7 @@ DIST libwps-0.1.0~svn20070129.tar.gz 426668 RMD160 5936f952392ec44aaa7d3fb836bc7
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.2.1.tar.gz 4845814 RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 SHA1 1051eb892960fe86ae7ce2b973ee21d1123ed5f7 SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d
-DIST ooo-build-2.3.0.1.2.tar.gz 6103972 RMD160 7359a6269662baa8f63853b2597438eeac1f7284 SHA1 cff1d7154612245ec38382f05b9d1c841f59e685 SHA256 f7f4342b470e249e0353789e92aa4704bc26624841bb2a1ca4e4d19c198beac3
+DIST ooo-build-2.3.0.1.90.tar.gz 7849585 RMD160 f9a2a2256b413c5fe5bd40b27c465318bff8a890 SHA1 3ff411e4e39b5d7872d938f7555a62e1f7766404 SHA256 2ea74f0b3d2030bd4194490bf69aec198072c2674d1ca3726184c7c1ff0797b6
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
@@ -72,14 +72,14 @@ EBUILD openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe0
 MD5 dac1ed6e687aa78d5b87cce285332fb7 openoffice-2.2.1.ebuild 11889
 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 openoffice-2.2.1.ebuild 11889
 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d openoffice-2.2.1.ebuild 11889
-EBUILD openoffice-2.3.0.ebuild 11974 RMD160 78d47930a72e27485cad142a36b59e8555a3685a SHA1 369ebbae3c35eda96144791e607a5a0d83b80efc SHA256 983b431916e7f17d06b83499571e130cf8f84b99e76637b3768a3ed95bea0d4c
-MD5 b62b83e85d264115aada78e25a94fb90 openoffice-2.3.0.ebuild 11974
-RMD160 78d47930a72e27485cad142a36b59e8555a3685a openoffice-2.3.0.ebuild 11974
-SHA256 983b431916e7f17d06b83499571e130cf8f84b99e76637b3768a3ed95bea0d4c openoffice-2.3.0.ebuild 11974
-MISC ChangeLog 70294 RMD160 752bec118377e664943ab893fe965b13a9fb78a6 SHA1 3cfb48e296b8d139c7b2cf30e8696e2fb98b6e5d SHA256 49834907d3b267483129ace721924e876f14dd505509b895690df415cf2f7566
-MD5 57bf170699b3b8a46dcdf6ebd3c4fd80 ChangeLog 70294
-RMD160 752bec118377e664943ab893fe965b13a9fb78a6 ChangeLog 70294
-SHA256 49834907d3b267483129ace721924e876f14dd505509b895690df415cf2f7566 ChangeLog 70294
+EBUILD openoffice-2.3.0.ebuild 11878 RMD160 27694d6c5399c13b59870d5fadb16a37197e1757 SHA1 9361880bdc45cfe0efaac14c12baa3ef5ec67e9f SHA256 5c1dd9ef14efcf76b1a979cf70bc0851925e719147492124325a540fa0827fbf
+MD5 a7dd8d126025b9cb12fda53244a1667c openoffice-2.3.0.ebuild 11878
+RMD160 27694d6c5399c13b59870d5fadb16a37197e1757 openoffice-2.3.0.ebuild 11878
+SHA256 5c1dd9ef14efcf76b1a979cf70bc0851925e719147492124325a540fa0827fbf openoffice-2.3.0.ebuild 11878
+MISC ChangeLog 70554 RMD160 10005e05194ca5e409fb2dd536bec3023ed9aaaa SHA1 6da7767c468b08f0608b8ad735ca3c6a6c3628b6 SHA256 20c91772e7e120da895bfb5616a0321b7da0f08e3fc9329ed84e064ea5e321a3
+MD5 baad170a47fbd006668777e30e945b96 ChangeLog 70554
+RMD160 10005e05194ca5e409fb2dd536bec3023ed9aaaa ChangeLog 70554
+SHA256 20c91772e7e120da895bfb5616a0321b7da0f08e3fc9329ed84e064ea5e321a3 ChangeLog 70554
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -87,6 +87,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f5f90d28e2fa42bdf0564c622b475978 files/digest-openoffice-2.2.1 3265
 RMD160 99b0f8c9c991ccc2ab6e4850bf52d73578f07aef files/digest-openoffice-2.2.1 3265
 SHA256 6ad627f46984c26bf39734c60fc5227e5b1bd1398fab95f261b2e18b016e87de files/digest-openoffice-2.2.1 3265
-MD5 66ea21045288845e5456bd125a2edd11 files/digest-openoffice-2.3.0 3241
-RMD160 9837703b7a82e0ae6bb00b1657558519edd4d231 files/digest-openoffice-2.3.0 3241
-SHA256 2670647bd1b3f250509243013d64c3c3a3a793eddc5d348598e83df4cd96d485 files/digest-openoffice-2.3.0 3241
+MD5 8d862dac5829329b7e4cbefda8354cb8 files/digest-openoffice-2.3.0 3244
+RMD160 763427c8042ae07f62a585b302adf79f149a3c9c files/digest-openoffice-2.3.0 3244
+SHA256 1c9e6129a9530072074945083a9035713eff1253aeb386c3c754ad66758d8c87 files/digest-openoffice-2.3.0 3244
diff --git a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
index 3c1c5420d81c..fbb5bb759d5b 100644
--- a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
+++ b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
@@ -8,68 +8,6 @@
  EOT
      chmod 755 $1
  }
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -80,8 +80,8 @@
- Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, OOXML
- QiLinux: LinuxCommon, GlobalDesktopFiles
- #Gentoo
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5
--GentooUnstable: GentooBase, GentooExperimental, OOXML, OOXSTLport5
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXML, OOXSTLport5
-+GentooUnstable: GentooBase, GentooExperimental
- Gentoo : GentooBase
- Gentoo64: GentooBase
- # rPath Linux
-@@ -719,6 +719,10 @@
- 
- # fixes linking dependency in the reportdesign module
- buildfix-reportdesign-util-dep.diff, i#81550, pmladek
-+
-+# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
-+# Debian #442338, Debian #442368
-+ucb-no-CURL_NO_OLDIES.diff
- 
- [ NovellOnlyWin32 ]
- SectionOwner => tml
-@@ -1055,18 +1055,8 @@
- [ GentooExperimental ]
- SectionOwner => hmth
- 
--# deliver - sshhhh....
--silent_deliver-i79798.diff, i#79798
- # Gnu JRE paths.
- gentooexperimental-gnujre.diff
--# unused java code
--disable-parser-jaxp.diff
--# default inc/lib
--config_office-XINC-XLIB-defaults.diff, i#65976
--# gdi/font.cxx: stl list error
--vcl_font-NO_LIST.diff
--# linux-headers-2.6.22 issue?!
--linux-headers.diff
- 
- [ GentooOnly ]
- SectionOwner => aprosky
-@@ -1081,6 +1071,17 @@
- system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
-+# deliver - sshhhh....
-+silent_deliver-i79798.diff, i#79798
-+# unused java code
-+disable-parser-jaxp.diff
-+# default inc/lib
-+config_office-XINC-XLIB-defaults.diff, i#65976
-+# gdi/font.cxx: stl list error
-+vcl_font-NO_LIST.diff
-+# linux-headers-2.6.22 issue?!
-+linux-headers.diff
-+
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
 --- distro-configs/Gentoo.conf.in 
 +++ distro-configs/Gentoo.conf.in 
 @@ -3,7 +3,6 @@
@@ -80,15 +18,15 @@
  --with-system-boost
  --with-system-curl
  --with-system-db
---- configure.in 
-+++ configure.in 
-@@ -1024,7 +1024,7 @@
- UPSTREAM_NAME=
- UPSTREAM_SOURCE=
- UPSTREAM_URI=
--if test "$with_tag" = "OOG680_m3" ; then # more milestones to come...
-+if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
-    UPSTREAM_NAME="OOo_2.3.0_src"
-    if test "z$with_mirror" != "z" ; then
-       UPSTREAM_SOURCE="MIRROR"
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -145,7 +145,7 @@
+ # crashes with undo/redo
+ 
+ #realize a new feature named as Show Data Form in OpenOffice
+-sc-dataform.diff, Amelia Wang
++#sc-dataform.diff, Amelia Wang
+ 
+ #First work on field enhancements...
+ sw-field-patch.diff, flr, n#248354
 
diff --git a/app-office/openoffice/files/digest-openoffice-2.3.0 b/app-office/openoffice/files/digest-openoffice-2.3.0
index 8dc6e7f7ab04..7a8ca443d153 100644
--- a/app-office/openoffice/files/digest-openoffice-2.3.0
+++ b/app-office/openoffice/files/digest-openoffice-2.3.0
@@ -25,9 +25,9 @@ SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e libwps-0
 MD5 26b3e95ddf3d9c077c480ea45874b3b8 lp_solve_5.5.0.10_source.tar.gz 769268
 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 lp_solve_5.5.0.10_source.tar.gz 769268
 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 lp_solve_5.5.0.10_source.tar.gz 769268
-MD5 b3d2f355af570accb8b2ac61cdba261e ooo-build-2.3.0.1.2.tar.gz 6103972
-RMD160 7359a6269662baa8f63853b2597438eeac1f7284 ooo-build-2.3.0.1.2.tar.gz 6103972
-SHA256 f7f4342b470e249e0353789e92aa4704bc26624841bb2a1ca4e4d19c198beac3 ooo-build-2.3.0.1.2.tar.gz 6103972
+MD5 ec8f1c58be702c4e7729d7a0d1830800 ooo-build-2.3.0.1.90.tar.gz 7849585
+RMD160 f9a2a2256b413c5fe5bd40b27c465318bff8a890 ooo-build-2.3.0.1.90.tar.gz 7849585
+SHA256 2ea74f0b3d2030bd4194490bf69aec198072c2674d1ca3726184c7c1ff0797b6 ooo-build-2.3.0.1.90.tar.gz 7849585
 MD5 42aceb3508ff8b5ed04d0451b30f6ccf oox.2007-09-05.tar.bz2 357665
 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 oox.2007-09-05.tar.bz2 357665
 SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 oox.2007-09-05.tar.bz2 357665
diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild
index d9eeaf9ec89a..623e958a4f43 100644
--- a/app-office/openoffice/openoffice-2.3.0.ebuild
+++ b/app-office/openoffice/openoffice-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.1 2007/09/18 07:27:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.2 2007/09/18 11:23:58 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.3.0.1.2"
+MY_PV="2.3.0.1.90"
 PATCHLEVEL="OOG680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -19,7 +19,7 @@ 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://go-oo.org/packages/OOG680/ooo-build-${MY_PV}.tar.gz
+	mirror://gentoo/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://go-oo.org/packages/SRC680/extras-2.tar.bz2
@@ -200,8 +200,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
 
-	cp -f ${FILESDIR}/${PV}/ucb-no-CURL_NO_OLDIES.diff ${S}/patches/src680 || die
-
 	if use ppc ; then
 		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
 		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die