remove unneeded menu stuff from user install

4 files changed, 42 insertions, 4 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index e916263b3ba1..33b05307d4ed 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.52 2004/07/13 21:41:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.53 2004/07/15 16:37:01 suka Exp $
+
+  15 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild:
+  Do not install unneeded old gnome and kde menu items in the user dir, thanks
+  to brad[] for pointing out
 
   13 Jul 2004; suka@gentoo.org +files/1.1.2/nativefix.diff,
   -files/1.1.2/nativewidgets-vcl.diff, openoffice-ximian-1.1.60.ebuild:
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
index 2aa200b127b5..d3972283cba6 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.13 2004/07/02 08:05:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.14 2004/07/15 16:37:01 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -479,6 +479,17 @@ src_install() {
 	# Remove unneeded stuff
 	rm -rf ${D}${INSTDIR}/share/cde
 
+	# Fix instdb.ins, to *not* install local copies of these
+	for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
+		perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\
+			s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \
+			s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \
+			s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \
+			s|^\tContains\s+\= .*|\tContains\t = ();\r| or \
+			s|\t\t\t\t\t\".*|\r|g)" \
+			${INSTDIR}/program/instdb.ins
+	done
+
 	# Make sure these do not get nuked.
 	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild
index f2b3822d7dfd..899a1a2c4df7 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild,v 1.6 2004/07/02 08:05:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.59.ebuild,v 1.7 2004/07/15 16:37:01 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -506,6 +506,17 @@ src_install() {
 	# Remove unneeded stuff
 	rm -rf ${D}${INSTDIR}/share/cde
 
+	# Fix instdb.ins, to *not* install local copies of these
+	for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
+		perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\
+			s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \
+			s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \
+			s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \
+			s|^\tContains\s+\= .*|\tContains\t = ();\r| or \
+			s|\t\t\t\t\t\".*|\r|g)" \
+			${INSTDIR}/program/instdb.ins
+	done
+
 	# Make sure these do not get nuked.
 	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
index 5f26223a3395..5303634bff1f 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.5 2004/07/15 08:45:42 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.6 2004/07/15 16:37:01 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -508,6 +508,17 @@ src_install() {
 	# Remove unneeded stuff
 	rm -rf ${D}${INSTDIR}/share/cde
 
+	# Fix instdb.ins, to *not* install local copies of these
+	for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
+		perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\
+			s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \
+			s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \
+			s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \
+			s|^\tContains\s+\= .*|\tContains\t = ();\r| or \
+			s|\t\t\t\t\t\".*|\r|g)" \
+			${INSTDIR}/program/instdb.ins
+	done
+
 	# Make sure these do not get nuked.
 	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }