Patchset bump to ooo-build-3.2.0.10, also fix upstream tarball mess-up

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

4 files changed, 33 insertions, 19 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2d4746a97dd2..5f4fa940de52 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.526 2010/04/17 23:52:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.527 2010/04/18 13:28:43 suka Exp $
+
+  18 Apr 2010; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff:
+  Patchset bump to ooo-build-3.2.0.10, also fix upstream tarball mess-up
 
   17 Apr 2010; Joseph Jezak <josejx@gentoo.org> openoffice-3.2.0.ebuild:
   Marked ppc stable for bug #305195.
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 31dc231bd1b5..a589fefd8bcd 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d SHA1 58ebb2cb06e03a2db56e798769e3f2d9b95dd823 SHA256 9ca280d88594658c214b21075e1a0f504106b29afe1b9b68915ca4c93b4fd1c2
 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 1313 RMD160 48509f072a026ee29bcd02284e6c450bcd17f738 SHA1 47cad3c984629a1bc9d3fab38cd860a1ab5d20b1 SHA256 8dfd0ffc55f39b7b76dc6eadcd02b0c3b77126a5dd61d1a74f498d09ad85ff1b
+AUX gentoo-3.2.0.diff 1972 RMD160 7c17515819d13c84c73b6361bc2c5fa3bcf26d17 SHA1 8d5df16b03e066e67a536e361b3670bca9651666 SHA256 f622b98d8988e904e6d168cbdc05ec44ae6388178f555d5943959f59282129f1
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
@@ -15,7 +12,7 @@ AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc5
 DIST OOo_3.2.0_src_binfilter.tar.bz2 6485071 RMD160 1a92582f7e9dc4c3dd57be6db0519f5d53e0b9ad SHA1 ef1041645ae444395f004eef4dbe31c472501476 SHA256 2acbd583f8b090e0fbdb5ea01d5362ad467b713299d29344fc7c80e5ff5083ca
 DIST OOo_3.2.0_src_core.tar.bz2 214923121 RMD160 2535240f28aa99777ca3768c366d5a465e044f72 SHA1 0246b77b0cb8445eb0c3ee9fb43f6e00ca54a61b SHA256 b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a
 DIST OOo_3.2.0_src_extensions.tar.bz2 13921000 RMD160 a274fabcc76bcc39640fe0c47a4ab008baffbcfd SHA1 860262cc0f3c6bf0e49d34ad495b956512265ad3 SHA256 6862b728fb1b5946399ddc1c7a3735a9ab84b696309a3af6c28cba7b885f5dd0
-DIST OOo_3.2.0_src_l10n.tar.bz2 104383205 RMD160 4821366494c0f12133451d94212a15504b95e281 SHA1 7fefe877a551b4910ad40f7c828024d64ad92abd SHA256 492d6909a3cff5de47b13d109479f6adb78532ba67725d0ee29f456c725ae4ea
+DIST OOo_3.2.0_src_l10n-fixed.tar.bz2 104366307 RMD160 f82cf11833e0cb77038921d127db6da8a14cc0cf SHA1 1cf8bb2c5a37e3d5aab6bf59bd018a0209b33e35 SHA256 3e633557845657dabab634e347827f56668c4c1d01ef3f925084ac30b43d01da
 DIST OOo_3.2.0_src_system.tar.bz2 59670795 RMD160 02281b8890c724b7f2ad3115578d876cd48dab0a SHA1 ea0cdaa50ac620219671deb30070d3c52d0e509c SHA256 97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a
 DIST OOo_3.2.0_src_testautomation.tar.bz2 49095034 RMD160 f8dd241fdfa788b367aaee9212a21d5085287b52 SHA1 2ceb738b76f70feb4b4459308180dd65fcedf7e5 SHA256 2acfd1e2c1f81096489dc453d8be99ab0df51130ddf29c14450aebb78a57a9a5
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
@@ -30,7 +27,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.7.tar.gz 13037854 RMD160 394fbf210c9f1d8cd6f591c3d0265a0ed17daea8 SHA1 1d194ff3f198fe1afa9e85bf27e6bbe55e99fed5 SHA256 7225363e8384734ee25a4da9877afdc399a41109f8a8870dd823d3f627c5fde6
+DIST ooo-build-3.2.0.10.tar.gz 13064810 RMD160 da7a0d18dee79db651fa144e9775511af1f0efdb SHA1 b6ebdf18e9022e62c5a6a457405d694ff218dde2 SHA256 41f42155d2d453576821ae6d24b125e6dce0bf9d95ea2f4267c6ae785305d63c
 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
@@ -54,13 +51,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 13584 RMD160 15969f5a766e81e3f58b329020cca83364cb1ba1 SHA1 c7e6f89929daf55a52828578f4b731a087c071e4 SHA256 ca222631f0b5510e4940415221afd60ce1f733936837fee297dfa1f993f3b7ef
-EBUILD openoffice-3.2.0.ebuild 13375 RMD160 e179afa0a646be5324ec4c5ab78c180fd8ab4090 SHA1 3aaf2b60d5cabaa3791c41df5e7d05bbb73b7781 SHA256 55ca8a7a9746a0a5af1a4ecbe1d7e0290fbdbb82993e74f11ad27ae99cbacfe6
-MISC ChangeLog 108053 RMD160 dc09adbcfd86579dc3d69b555fbe75098dc9a40c SHA1 76ec46e74a43e6938d4b37dcac7a9719798e75ef SHA256 8e6ee3c8831c533e78d8f2beb65d15f8cf2a5c6db938775ee854f52e7e24e0c7
+EBUILD openoffice-3.2.0.ebuild 13399 RMD160 468b251319b7d96af2e02b13f2f1b08035c67f5a SHA1 6c0373e9c57c55aea5dabdd7775d646bb49dba36 SHA256 232bf7d090bf8083551ba5d870d75bee32b28b2eb92eba491eb8dbf90a843de9
+MISC ChangeLog 108230 RMD160 665bae79ddbc83618e0c630073d680e72ea3e202 SHA1 ec46366f56f1e87ec5f15e130bb4872a830b878b SHA256 b58ffe7ce55acd67ae9af51777d1c0027f9bb44e374d368b39cedef6436972e7
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvKSc4ACgkQcsIHjyDViGRDLwCffmGBgXK+okFRKlFmc2S+CD93
-l9oAoKWlm7gJiCS6wHn0V9ZmxSLNKFdE
-=RHYl
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff
index 864400705d9a..1b00c342e834 100644
--- a/app-office/openoffice/files/gentoo-3.2.0.diff
+++ b/app-office/openoffice/files/gentoo-3.2.0.diff
@@ -9,6 +9,15 @@
  # support server-only versions of 64bit JDKs
  64bit-jdk-server-paths.diff, i#65974, hmth
  # use IBM j9vm over IBM classic JVM
+@@ -2932,7 +2932,7 @@
+ l10n-build-only-selected-langs.diff, i#106185, pmladek
+ 
+ [ LocalizeFixes < ooo320-m13 ]
+-i109407_BUSCAR.diff
++#i109407_BUSCAR.diff
+ 
+ [ PieceBits ]
+ # zipintro is not kind to us ...
 @@ -3561,7 +3561,6 @@
  [ BuildBits ]
  # Allow oowintool to detect java sdk 1.6.x
@@ -44,4 +53,15 @@
      AC_MSG_RESULT([$SUNTEMPLATES_LANG])
  fi
  AC_SUBST(SUNTEMPLATES_LANG)
+--- bin/setup.in 
++++ bin/setup.in 
+@@ -268,7 +268,7 @@
+     OOO_TARBALL="${UPSTREAM_NAME}_core.tar.bz2"
+     OOO_SYSTEM_TARBALL="${UPSTREAM_NAME}_system.tar.bz2"
+     OOO_BINFILTER_TARBALL="${UPSTREAM_NAME}_binfilter.tar.bz2"
+-    OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2"
++    OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n-fixed.tar.bz2"
+     OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2"
+ else
+     OOO_TARBALL="$CVSTAG-core.tar.bz2"
 
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index 226d531c095d..11d75e68859f 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.20 2010/04/17 23:52:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.21 2010/04/18 13:28:43 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -11,7 +11,7 @@ inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV=3.2.0.7
+MY_PV=3.2.0.10
 PATCHLEVEL=OOO320
 SRC=OOo_${PV}_src
 MST=OOO320_m12
@@ -24,9 +24,9 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
 SRC_URI="${DEVPATH}_core.tar.bz2
 	${DEVPATH}_extensions.tar.bz2
-	${DEVPATH}_l10n.tar.bz2
 	${DEVPATH}_system.tar.bz2
 	${DEVPATH}_testautomation.tar.bz2
+	mirror://gentoo/OOo_3.2.0_src_l10n-fixed.tar.bz2
 	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
 	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
 		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt