Prevent OOo from double installing menu entries, closes bug #53752

Package-Manager: portage-2.0.51-r13

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index d186258abe7c963c66c12235e413843c7eac28e0..b3cb09049b5db5bd26c9bb9b748727d8ee3f7c7d 100644 (file)
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.57 2005/01/14 15:10:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.58 2005/01/16 20:05:54 suka Exp $
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.4.ebuild:
+  Prevent OOo from double installing menu entries, closes bug #53752
 
   14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
   openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.3.ebuild,

diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
index ee95b1d8b781a3b5b10b78c6240fbff253b5ad91..8ca45f02f77cd921d74c4a8b0ad34244adeb7a5e 100644 (file)
--- a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.5 2005/01/14 15:10:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.6 2005/01/16 20:05:54 suka Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -175,6 +175,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)" \
+                       ${D}${INSTDIR}/program/instdb.ins
+       done
+
        # Make sure these do not get nuked.
        keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
        keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
@@ -184,15 +195,6 @@ src_install() {
        find ${D} -type f -exec touch {} \;
 }
 
-pkg_preinst() {
-
-       # The one with OO-1.0.0 was not valid
-       if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
-       then
-               rm -f ${ROOT}/etc/openoffice/autoresponse.conf
-       fi
-}
-
 pkg_postinst() {
 
        einfo " To start OpenOffice.org, run:"

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index d723291aedc51814c5ebd19d4b4749e33ffc37ab..90d71ad83145caae05deb1b8a37cb30a4cb756fa 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.99 2005/01/14 15:49:06 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.100 2005/01/16 20:07:53 suka Exp $
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Prevent OOo from double installing menu entries, closes bug #53752
 
   14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/1.1.4/javafix.patch, openoffice-1.1.4.ebuild:

diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index 3df27fb4b19f430d914947b6586cfd4b2283b973..875897aa8f809929bd21b4d66c7214145b89aa90 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.6 2005/01/14 15:49:06 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.7 2005/01/16 20:07:53 suka Exp $
 
 # Notes:
 #
@@ -512,16 +512,17 @@ src_install() {
                done
        fi
 
-       # Do not actually install the desktop bindings for users, we have
-       # installed them globally
-       for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde
-       do
-               perl -pi -e "/^Module $module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
-               ${D}${INSTDIR}/program/instdb.ins
+       # 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)" \
+                       ${D}${INSTDIR}/program/instdb.ins
        done
 
-
-
        # Remove unneeded stuff
        rm -rf ${D}${INSTDIR}/share/cde