Remove broken patches to fix crasher bug #139368

Package-Manager: portage-2.1.1_pre2-r4

3 files changed, 22 insertions, 9 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 9872ae50297b..63e47acaf42f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.230 2006/07/05 07:48:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.231 2006/07/06 19:17:46 suka Exp $
+
+  06 Jul 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.3/gentoo-2.0.3.diff:
+  Remove broken patches to fix crasher bug #139368
 
   05 Jul 2006; Lars Weiler <pylon@gentoo.org> openoffice-2.0.3.ebuild:
   Stable on ppc; security bug #138545.
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 8cf412b121b7..874d4df96d32 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -10,10 +10,10 @@ AUX 2.0.2/omit-fp-workaround.diff 5179 RMD160 ea9136911827c90d1322dec5e2a7758716
 MD5 0869a9ff1bb38a93e52da2308ef654c0 files/2.0.2/omit-fp-workaround.diff 5179
 RMD160 ea9136911827c90d1322dec5e2a77587168c2231 files/2.0.2/omit-fp-workaround.diff 5179
 SHA256 62eeb363874a17fe40d2cc1188ea7249807ded1b7456e1d00e455accdc3eeb46 files/2.0.2/omit-fp-workaround.diff 5179
-AUX 2.0.3/gentoo-2.0.3.diff 1083 RMD160 2c476e704c83612149d4bebf74b5becc76a15b6b SHA1 c14ebaa16e86830376d1171b4ba089faecb0239a SHA256 b7e64625bcf4494f66976b71e62bc09d4140460fb1ffe1bff917ea7aedaf5f47
-MD5 d49ab795e65bb4121c8719a03b9576e5 files/2.0.3/gentoo-2.0.3.diff 1083
-RMD160 2c476e704c83612149d4bebf74b5becc76a15b6b files/2.0.3/gentoo-2.0.3.diff 1083
-SHA256 b7e64625bcf4494f66976b71e62bc09d4140460fb1ffe1bff917ea7aedaf5f47 files/2.0.3/gentoo-2.0.3.diff 1083
+AUX 2.0.3/gentoo-2.0.3.diff 1613 RMD160 bffab253cda3e4029ad6410cdb0ecab9dddc5947 SHA1 bdc961f5c56a1fca814427d578db0bd54f110d77 SHA256 81a35a347ab09eb8f2e458b0d0dc2cc69126c62d7c69b348e71ea6618b7e1961
+MD5 8035a314dfa6b49773a000d2c6055038 files/2.0.3/gentoo-2.0.3.diff 1613
+RMD160 bffab253cda3e4029ad6410cdb0ecab9dddc5947 files/2.0.3/gentoo-2.0.3.diff 1613
+SHA256 81a35a347ab09eb8f2e458b0d0dc2cc69126c62d7c69b348e71ea6618b7e1961 files/2.0.3/gentoo-2.0.3.diff 1613
 DIST OOO_2_0_1-binfilter.tar.bz2 18062219 RMD160 2ff50011435543209c3d7956e43c239ac4551450 SHA1 ea1a16372428db0337d3f0b6a42c3778cd4f4193 SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8
 DIST OOO_2_0_1-core.tar.bz2 109793621 RMD160 39af65ae67c6db30b39327da5821064af390a205 SHA1 950ec211715f990abd09487b71507aaa3b87d7e6 SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3
 DIST OOO_2_0_1-lang.tar.bz2 55193297 RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a SHA1 64ce31b89f2745d5206e175d06e3d3a209a696d1 SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705
@@ -54,10 +54,10 @@ EBUILD openoffice-2.0.3.ebuild 8717 RMD160 4b08f5d8c91c711b69279a6c48f51dd476d7f
 MD5 a63d683a858af47d5d3b389ea845d7ae openoffice-2.0.3.ebuild 8717
 RMD160 4b08f5d8c91c711b69279a6c48f51dd476d7f11e openoffice-2.0.3.ebuild 8717
 SHA256 9a94a2d0544ef35c32ed9a746afab8c4f337ac88662bb6228c5c652d1775b07d openoffice-2.0.3.ebuild 8717
-MISC ChangeLog 48614 RMD160 db212bff2b389dba0ce60e6119fc003e4b1dfb5e SHA1 70f7d8817b172a7784248d4102e7ccae2e9293bd SHA256 1014af08ea118aa60dba26113e0ee1708da24269b52a1b8950bf2e1ca74bc50e
-MD5 4acfd37db7f7d1d0a97e8c29095846c3 ChangeLog 48614
-RMD160 db212bff2b389dba0ce60e6119fc003e4b1dfb5e ChangeLog 48614
-SHA256 1014af08ea118aa60dba26113e0ee1708da24269b52a1b8950bf2e1ca74bc50e ChangeLog 48614
+MISC ChangeLog 48751 RMD160 fd7c024f302ff427795b72fd754e7f890641dcd9 SHA1 5fa50c18d722ddad9815bf3678499b3003b68bf7 SHA256 07a4f8facc929fcfbe1c7fd0a8e367a4eb8ff6339b5e95bc54f30185fb34713e
+MD5 9a830637daba89a10a625310316868f3 ChangeLog 48751
+RMD160 fd7c024f302ff427795b72fd754e7f890641dcd9 ChangeLog 48751
+SHA256 07a4f8facc929fcfbe1c7fd0a8e367a4eb8ff6339b5e95bc54f30185fb34713e ChangeLog 48751
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.0.3/gentoo-2.0.3.diff b/app-office/openoffice/files/2.0.3/gentoo-2.0.3.diff
index 1c911a99dca8..1875e6569be8 100644
--- a/app-office/openoffice/files/2.0.3/gentoo-2.0.3.diff
+++ b/app-office/openoffice/files/2.0.3/gentoo-2.0.3.diff
@@ -32,6 +32,15 @@
  
 --- patches/src680/apply 
 +++ patches/src680/apply
+@@ -15,7 +15,7 @@
+ 	 Icons, Branding, VBABits, VBAObjects, CalcFixes, Leaks, Egg
+ LinuxCommon : Common, BuildBitsLinuxOnly, LinuxOnly, SystemBits, CWSBackports, GCJ, \
+ 	      QPro, Lwp, cairocanvas, msaccess, KDE, \
+-	      64bitPatches, FPickers, Mono, AddressBooks, QuickStarter, SpeedImageList
++	      64bitPatches, FPickers, Mono, AddressBooks, QuickStarter
+ Win32Common : Common, Win32Only, NotDebian
+ 64bit : GCJExperimental, SystemJavaBits
+ # Binfilter patches: a special distro; applied only when building with binfilter
 @@ -1046,7 +1046,7 @@
  SectionOwner => aprosky