From: Andreas Proschofsky <suka@gentoo.org>
Date: Fri, 14 Jan 2005 15:28:10 +0000 (+0000)
Subject: Fix for -gnome -kde
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2867cb7db15cbb61af1b5e727b996bc3fe3671d9;p=gentoo.git

Fix for -gnome -kde
Package-Manager: portage-2.0.51-r12
---

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 74ab26739729..1ce0e97730f9 100644
--- 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.88 2005/01/12 23:05:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.89 2005/01/14 15:28:10 suka Exp $
+
+  14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/gentoo-1.3.7.patch:
+  Fix for building with -gnome and -kde
 
 *openoffice-ximian-1.3.7 (13 Jan 2005)
 
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 46829a300896..8889786e42cd 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
 MD5 7dda26d4577d9455b4bc3c1743bb192e openoffice-ximian-1.3.7.ebuild 17017
-MD5 c591588c74359a9a7c6e2b6231d4476e ChangeLog 22081
+MD5 49b294338ed66f44e93d86d9fc6fde58 ChangeLog 22209
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
@@ -18,7 +18,7 @@ MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
-MD5 ac476fa5693b08cd28838931d5a73c3e files/1.1.3/gentoo-1.3.7.patch 443
+MD5 03a4e552b53cb7fc9da8d844369ff647 files/1.1.3/gentoo-1.3.7.patch 995
 MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
index 5aae80515b08..d86f1ad62d1e 100644
--- a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
+++ b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
@@ -1,5 +1,19 @@
 --- patches/OOO_1_1_3/apply.orig	2004-12-02 00:07:00.659646960 +0100
 +++ patches/OOO_1_1_3/apply	2004-12-02 00:07:18.119992584 +0100
+@@ -27,9 +27,10 @@
+ PLD  : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonArkCommon
+ KDE  : LinuxCommon, KDEOnly
+ Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles
+-Gentoo : LinuxCommon, GlobalDesktopFiles, NonArkCommon, GentooOnly
+-GentooGNOME : Gentoo, GnomeVFS, NovellOnly
+-GentooKDE : Gentoo, KDECommon
++GentooBase : LinuxCommon, GlobalDesktopFiles, NonArkCommon
++Gentoo: GentooBase
++GentooGNOME : GentooBase, GnomeVFS, NovellOnly
++GentooKDE : GentooBase, KDECommon
+ 
+ # somewhat odder:
+ Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only
 @@ -1121,14 +1121,6 @@
  
  ########################################################