Fix our distro-specific stuff to actually work

Package-Manager: portage-2.0.52-r1

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 533e8b4dbbe6123baf000a073bef753d5012ab4f..e7e9081079eee760823cc66435feffa8daef989e 100644 (file)
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.138 2005/09/17 07:33:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.139 2005/09/17 14:16:30 suka Exp $
+
+  17 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.5/gentoo-1.3.16.patch:
+  Fix our patch to actually work...
 
 *openoffice-ximian-1.3.16 (17 Sep 2005)
 

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 8db5e6bfb8df3676ff9c695897f8b8ad696c0c95..f5b27cc8ae3c843b19af2350f0a0e015739bb537 100644 (file)
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 3908545ea3f61c386910277dc6201042 openoffice-ximian-1.3.14.ebuild 17995
 MD5 d988cd13c1a42ab71db133d116c19f67 openoffice-ximian-1.3.16.ebuild 17832
 MD5 2172597e048d38d848b3ee1ffdda7790 openoffice-ximian-1.3.9-r1.ebuild 17912
-MD5 000e89af73fe74b094f2aef3747d05c2 ChangeLog 34061
+MD5 39ffa2d96ae8afecd31f1f6157b5652e ChangeLog 34186
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492
 MD5 62fa209accdad43ffb6c4fe805cddda5 files/digest-openoffice-ximian-1.3.14 493
@@ -27,7 +27,7 @@ MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.5/gentoo-splash.diff 890
 MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
-MD5 591d9e79d6a7d61d1cc17c3931b2f631 files/1.1.5/gentoo-1.3.16.patch 1182
+MD5 09e70c259e5c6767251d0e22f6775a8d files/1.1.5/gentoo-1.3.16.patch 1120
 MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
 MD5 ba6affa60977e5d658fe5a2125abb691 files/1.1.5/xooffice-wrapper-1.3 6091
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.5/pthreadlink-fix.patch 1163

diff --git a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch b/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
index 8b1aa89f2f34cf806f1dda5a9757edd1990ea117..b4179079b6a7d2dbe4b5acc6965487c87da60a96 100644 (file)
--- a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
+++ b/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
@@ -1,5 +1,5 @@
---- patches/OOO_1_1_4/apply.orig       2004-12-02 00:07:00.659646960 +0100
-+++ patches/OOO_1_1_4/apply    2004-12-02 00:07:18.119992584 +0100
+--- patches/OOO_1_1_5/apply.orig       2004-12-02 00:07:00.659646960 +0100
++++ patches/OOO_1_1_5/apply    2004-12-02 00:07:18.119992584 +0100
 @@ -33,9 +33,10 @@
  PLD  : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
  KDE  : LinuxCommon, FilePickers, KDEOnly, NoRpath
@@ -14,8 +14,6 @@
  
  # somewhat odder:
  Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath
---- patches/OOO_1_1_5/apply 
-+++ patches/OOO_1_1_5/apply.new 
 @@ -1306,11 +1306,6 @@
  
  ########################################################