Bump ooo-build patchset to latest release (3.1.1.5)

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

3 files changed, 16 insertions, 7 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 78664fd1b259..e4c91829d38a 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.501 2009/11/27 13:32:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.502 2009/11/28 20:17:22 suka Exp $
+
+  28 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.1.ebuild:
+  Bump ooo-build patchset to latest release (3.1.1.5), bunch of 
+  bugfixes, see:
+
+  http://cgit.freedesktop.org/ooo-build/ooo-build/tree/NEWS?h=ooo-build-3-1-
+  1
+
+  for more information.
 
   27 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 42a31c59e45d..6e5d586e2dad 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -16,7 +16,7 @@ DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA
 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.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
-DIST ooo-build-3.1.1.4.tar.gz 14009955 RMD160 9d1071d54b3c4bfa593085f206d6a865d3c65751 SHA1 4fbd62270587642f7e629fb9c63b069eb95aa66d SHA256 d6cc2838026ff5aeb6596d657c3aafd5c98a90cae0ed3d9ec5a2e42b4c74a1a8
+DIST ooo-build-3.1.1.5.tar.gz 14060582 RMD160 86c7753e30e3deb35395b5657f2c9b68f0cf038a SHA1 b5000935e9910aee8dd2101d82bad86381ce6b2d SHA256 b2ee3b651b56cc4cb47e0077835e5680a2eb557785ede10a645055ba5e171ade
 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
@@ -39,6 +39,6 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 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 13521 RMD160 39cb2863fab34cd562201924c4123930131f1a3e SHA1 fc7f548000fc2cbde6172ccc1fd7fdf92045f0ba SHA256 1686801aa2880809bdd356bfc9bdf8b5403f0e9131322755b61df708f812f0b9
-MISC ChangeLog 103646 RMD160 85d87468b916f0dfcf56bf50da37306ef913b98b SHA1 8337b922cd7a8d4e49f584a846a5dfa64986e6c8 SHA256 0ad73d884ad2af34e542041df8fb4591195db21a6fdf1d85b93ee28e86631bf0
+EBUILD openoffice-3.1.1.ebuild 13475 RMD160 f78c712492043ed8d13c992e0bc3d2e53b795915 SHA1 415e3638b8296d7d77dfc8d955f6bc0d69a5aa7a SHA256 c689e93a23234c020bb743bb30649d4dec3260c2f2341f75a85adb5c02a631ce
+MISC ChangeLog 103916 RMD160 00517a0fdc0af795d79d1b005be29abce0067e01 SHA1 9a698c09b8afe99554cb62870fec1cc2e87d3ef9 SHA256 448d94bb0d068f956b547a286ce836647b8f8b7d03652dae2037d3d5efa11d5d
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index bb77eeeeb081..79de45c014b6 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.22 2009/11/27 13:32:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.23 2009/11/28 20:17:22 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 templates"
 
-MY_PV=3.1.1.4
+MY_PV=3.1.1.5
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
 MST=ooo310-m19
@@ -235,7 +235,6 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
-	epatch "${FILESDIR}/ooo-build-patchver.diff"
 	epatch "${FILESDIR}/Gentoo_ODK_install.patch"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die