Silent bump to ooo-build 3.2.0.6 patchset, minor fixes

Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 15 insertions, 9 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5a6688331797..45ffa7faae33 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.508 2010/02/21 11:45:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.509 2010/02/21 17:11:11 suka Exp $
+
+  21 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff:
+  Silent bump to ooo-build 3.2.0.6 patchset, minor fixes
 
   21 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.2.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index d967467f6f52..f8cf7931fcb0 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,7 +2,7 @@ AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1 65602b7388e8754d6c33ea641d7622f5ede80e1b SHA256 93b4f41a59a3b79880db4c5aa6eb937c9a34f4a0de94ef28f1ea24534ca2ad4b
-AUX gentoo-3.2.0.diff 532 RMD160 07e5f2cc34b79b15753b9c4caaa9299cf7aeef3a SHA1 7290aa06bc150f7fe02239ccad6d368dceb7bc85 SHA256 2c666917f3846bd1402f3ee6e114cf61979cea06f846ad0ad8714999e1a127d0
+AUX gentoo-3.2.0.diff 554 RMD160 9e226cf6dd9b2123685c3ca20e304eb0834f381b SHA1 8b45c342c7894e0b474efe87cce59bcbaa488e6b SHA256 2ccec0d96f8a5a260c449013f949ac544b959478e7c5931350422a8e45239ae2
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
@@ -24,7 +24,7 @@ DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST ooo-build-3.1.1.5.tar.gz 14060582 RMD160 86c7753e30e3deb35395b5657f2c9b68f0cf038a SHA1 b5000935e9910aee8dd2101d82bad86381ce6b2d SHA256 b2ee3b651b56cc4cb47e0077835e5680a2eb557785ede10a645055ba5e171ade
-DIST ooo-build-3.2.0.5.tar.gz 12984221 RMD160 4f4e878484c4faa8d5db3a01cd30888769ff3627 SHA1 0b81bef6248454f35579640fc2a02be657b12fe1 SHA256 1d183d380efeb6991d3c3cd7fa439d3eca2a7822ed2163c359f106e3b58df0ad
+DIST ooo-build-3.2.0.6.tar.gz 13033326 RMD160 ee6bfcfb81cdc6296302b32b24f9eba13168fdb8 SHA1 4321183859aea66c28e2c7d94ce00ca78d5c7742 SHA256 ad0f72867e93278b8cbcfb2fee613030cbb031c0f823450d3570c6e585ea8b10
 DIST ooo310-m19-artwork.tar.bz2 9813919 RMD160 08f5228c9e85f7a287ccca70e25ecc66a4bbd053 SHA1 14ff8ae12d43c7f1c725c3c913fda848ecf54b0f SHA256 9e741c889c1bc80aea8d15ea5e1087d4750f874a8690e1926d6b88c24a133ff8
 DIST ooo310-m19-base.tar.bz2 3336925 RMD160 ea26c3664d1c52f0030e8fa5a1f0962b147f726b SHA1 18f33c1976d0e427cb4ac98041d82e0a8cd948c8 SHA256 9f6ff29dd9be1d7618bb8dc558ec4a4001b6e7bd8db8c70270ea756a36e1bc4a
 DIST ooo310-m19-bootstrap.tar.bz2 7270281 RMD160 456198813294cb74fccc80461f4e65d5c1f39638 SHA1 cbf62263d6b094cb348f16bb3e345425beee05f7 SHA256 3cc9653477d9a491dd2412e5a8cae848700a0a5b8a23d0c7a9e7b076751de287
@@ -48,6 +48,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-EBUILD openoffice-3.2.0.ebuild 12709 RMD160 00a5ef3510e82ea000a35dcb42d0044a0583b60d SHA1 1d78dfa7f3caa21ea057812ad6bec67b6918bc7f SHA256 5fbc718de8662e8590da5f50123c05af22deb64001db3ab440e6985487480323
-MISC ChangeLog 105076 RMD160 ecda7017b64c835258b2041f3e9fc00c0f49e0ef SHA1 1987479573992989902e5cb2160068298af5485b SHA256 3cef24f2456790b85fe3bb169fe8e6ad5e0ea00bbb94173b2fd014ab209e58f9
+EBUILD openoffice-3.2.0.ebuild 12709 RMD160 5048c04289d79c8c1a08eb89ed30c5cc036c4ece SHA1 c2d44b4ec85037a9a6431846c932f5eeb041a17d SHA256 d902269018198b8b39471b78f9769bc9791c69b2358031a5d27a9cfd1f9de0ad
+MISC ChangeLog 105239 RMD160 c95483d0224dc9cc7d87502a63b1734da72eabec SHA1 869d3748932aa98e86d98585718833e15b23a64d SHA256 b276590990343d9779480545db18d22f4421cf98451874b61082d38c4230d400
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff
index 6abd7731d06b..b3d2f547f4f9 100644
--- a/app-office/openoffice/files/gentoo-3.2.0.diff
+++ b/app-office/openoffice/files/gentoo-3.2.0.diff
@@ -9,10 +9,12 @@
  # support server-only versions of 64bit JDKs
  64bit-jdk-server-paths.diff, i#65974, hmth
  # use IBM j9vm over IBM classic JVM
-@@ -3550,4 +3550,4 @@
+@@ -3561,7 +3561,6 @@
  [ BuildBits ]
  # Allow oowintool to detect java sdk 1.6.x
  oowintool-java6.diff, fridrich
 -connectivity-build-fix-mac.diff, thorsten
-+#connectivity-build-fix-mac.diff, thorsten
+ vcl-xinerama-clone-fix.diff, n#578730, thorsten
+ 
+ [ HyphenFix ]
 
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index 4b92cf59a49d..538f3f04228f 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.2 2010/02/21 11:45:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.3 2010/02/21 17:11:11 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -11,7 +11,7 @@ inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
 
-MY_PV=3.2.0.5
+MY_PV=3.2.0.6
 PATCHLEVEL=OOO320
 SRC=OOo_${PV}_src
 MST=OOO320_m12