Update to official ooo-build-tarball, a few more bugfixes included

Package-Manager: portage-2.1.2.7

4 files changed, 23 insertions, 19 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 68bab247a56d..d18309e50ca6 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.320 2007/05/08 21:10:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.321 2007/05/14 09:10:06 suka Exp $
+
+  14 May 2007; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.2.0.ebuild:
+  Update to official ooo-build-tarball, a few more bugfixes included
 
   08 May 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.2.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 46b5aa4dbb52..a156d1d97bb5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -69,7 +69,7 @@ DIST libwpd-0.8.8.tar.gz 563088 RMD160 09632cf9c84f12d7850399e0119407b1a0d29139
 DIST libwps-0.1.0~svn20070129.tar.gz 426668 RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 SHA1 928c486d53277072e90fec5dcaa762934e8467d6 SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.1.10.tar.gz 4442422 RMD160 9974eecc218a5164037edecba9a446665471e5fa SHA1 b00f7eb367bc3c1b931295e9d28175849b586255 SHA256 984bf5efea22a5b331756e1ada95b53f00d1e74b996af0c314fe1e4f28a2df93
-DIST ooo-build-2.1.93.tar.gz 4887562 RMD160 f67ddae88dc485c5020f705c62f99e10fc737099 SHA1 13840e4ffeaca465a10cd72597516b6ee7c974e5 SHA256 18a36d6ebb5b05ac34dc33434329e8029d747e4c9a4c3bc72b65f1c945fdbdc8
+DIST ooo-build-2.2.0.0.tar.gz 4810924 RMD160 3c0e2f1d21ce80efe2e3ef522296f2ee0aae7974 SHA1 45596596fb0514f477444c901fb6dd051d1b627d SHA256 1b99de4fb1bcf7a9869760586f87505bcf719792539990b141e738f47032f477
 DIST ooo_tango_images-1.tar.bz2 1250240 RMD160 bf770dd86e571d59217d01f1ca23559507b33a0d SHA1 c9815d9bbaf94a6b560af0212ebcab5881b43b85 SHA256 21cf830d485d7e2125f1b478bcfbd941896bfe7c8c5c070e87dfae0bd90a8bcf
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
@@ -77,14 +77,14 @@ EBUILD openoffice-2.1.0-r1.ebuild 11912 RMD160 3485b04bc13db7ca29e223121c4322ffd
 MD5 671bfd761cc9c9667ed3aeaaecbd9ba5 openoffice-2.1.0-r1.ebuild 11912
 RMD160 3485b04bc13db7ca29e223121c4322ffd76e7697 openoffice-2.1.0-r1.ebuild 11912
 SHA256 a57ffa4bd36d004e90c72bdf6bf7faf1f20da5304754df5ffa3376b29bd507ec openoffice-2.1.0-r1.ebuild 11912
-EBUILD openoffice-2.2.0.ebuild 11769 RMD160 38d9830a10f11a1fafbe381f14f2923ff9541ae9 SHA1 2b5844c41f0786f8be930aebd61f9293f39d1ee7 SHA256 9e787c6186e680202a71eaa26d778abcb2152a22c3ef65aab191f1c021cbffbe
-MD5 8a45db8eae0330a81c05778ee77a1f44 openoffice-2.2.0.ebuild 11769
-RMD160 38d9830a10f11a1fafbe381f14f2923ff9541ae9 openoffice-2.2.0.ebuild 11769
-SHA256 9e787c6186e680202a71eaa26d778abcb2152a22c3ef65aab191f1c021cbffbe openoffice-2.2.0.ebuild 11769
-MISC ChangeLog 66560 RMD160 496092d17adb84da9bf2fbdd68837bc920dcee03 SHA1 4c000f30d771f33eb9552ee30607cbd0f75a6231 SHA256 22f44582fb62bb533e3b39d42b98d35260f55f6d899751c48db3657e12f93619
-MD5 dcc534ed6623f7dfc2c91010c0553ed4 ChangeLog 66560
-RMD160 496092d17adb84da9bf2fbdd68837bc920dcee03 ChangeLog 66560
-SHA256 22f44582fb62bb533e3b39d42b98d35260f55f6d899751c48db3657e12f93619 ChangeLog 66560
+EBUILD openoffice-2.2.0.ebuild 11787 RMD160 180400ac314825d977dd4af809367aa068a6e50e SHA1 9af46ddc4559a68a71505e15982fbd15aacc9689 SHA256 22ece70394d1948c5759a656b0a16f51cf6f054d2d443eebd6a1638b203f50e5
+MD5 74464f48ff77e577c5132803c9f91ef0 openoffice-2.2.0.ebuild 11787
+RMD160 180400ac314825d977dd4af809367aa068a6e50e openoffice-2.2.0.ebuild 11787
+SHA256 22ece70394d1948c5759a656b0a16f51cf6f054d2d443eebd6a1638b203f50e5 openoffice-2.2.0.ebuild 11787
+MISC ChangeLog 66710 RMD160 88821bdc843599af1e5a21e4101fa22928728332 SHA1 92f719cd6d43d9a4e7c759afeb29fd681b0110d8 SHA256 30e0104d011113ed1fad2522be412abecb6544ea100803ee438ce2395d6b986d
+MD5 6102075536f580394ba1f7c2ae1d4b3d ChangeLog 66710
+RMD160 88821bdc843599af1e5a21e4101fa22928728332 ChangeLog 66710
+SHA256 30e0104d011113ed1fad2522be412abecb6544ea100803ee438ce2395d6b986d ChangeLog 66710
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -92,6 +92,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 28b4b0589a199e46096fd4793744ee5c files/digest-openoffice-2.1.0-r1 3497
 RMD160 4f5491d79d729b8c7f8f4c409f3d87eb4070d95c files/digest-openoffice-2.1.0-r1 3497
 SHA256 77b7cd664444eb5b805028ceccb1c86de8fe1b8713585bfb162093a9ccf11ed5 files/digest-openoffice-2.1.0-r1 3497
-MD5 a96259d64b69dc61c56b574f52800be1 files/digest-openoffice-2.2.0 3232
-RMD160 932a3321bf90540533e9e07ab6112717b652c76f files/digest-openoffice-2.2.0 3232
-SHA256 0f0b83b589a8f37992cb0689a631c5e6554d94328e386652b5255ce454592cb7 files/digest-openoffice-2.2.0 3232
+MD5 9978512a410d326ea4897c56ad02a3ea files/digest-openoffice-2.2.0 3235
+RMD160 da4e427b58b727a0ccf321a780b81da2ce6ae0ec files/digest-openoffice-2.2.0 3235
+SHA256 c98e1542eea4c1dd4bff7f81e3e5d18093fd248a5891e7758c8ff934b8e05321 files/digest-openoffice-2.2.0 3235
diff --git a/app-office/openoffice/files/digest-openoffice-2.2.0 b/app-office/openoffice/files/digest-openoffice-2.2.0
index 6433583fffb1..3c67ac726a2f 100644
--- a/app-office/openoffice/files/digest-openoffice-2.2.0
+++ b/app-office/openoffice/files/digest-openoffice-2.2.0
@@ -28,9 +28,9 @@ SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 ecd4bb01d608f5d07aee47429ddcf074 ooo-build-2.1.93.tar.gz 4887562
-RMD160 f67ddae88dc485c5020f705c62f99e10fc737099 ooo-build-2.1.93.tar.gz 4887562
-SHA256 18a36d6ebb5b05ac34dc33434329e8029d747e4c9a4c3bc72b65f1c945fdbdc8 ooo-build-2.1.93.tar.gz 4887562
+MD5 3d969f1a303163b69a32247407161d77 ooo-build-2.2.0.0.tar.gz 4810924
+RMD160 3c0e2f1d21ce80efe2e3ef522296f2ee0aae7974 ooo-build-2.2.0.0.tar.gz 4810924
+SHA256 1b99de4fb1bcf7a9869760586f87505bcf719792539990b141e738f47032f477 ooo-build-2.2.0.0.tar.gz 4810924
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
diff --git a/app-office/openoffice/openoffice-2.2.0.ebuild b/app-office/openoffice/openoffice-2.2.0.ebuild
index 5d5b13abd1c2..fa1077196f7c 100644
--- a/app-office/openoffice/openoffice-2.2.0.ebuild
+++ b/app-office/openoffice/openoffice-2.2.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.2.0.ebuild,v 1.6 2007/05/08 21:10:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.7 2007/05/14 09:10:06 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 branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav"
 
-MY_PV="2.1.93"
+MY_PV="2.2.0.0"
 PATCHLEVEL="OOF680"
 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 )
-	mirror://gentoo/ooo-build-${MY_PV}.tar.gz
+	http://go-oo.org/packages/OOF680/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