diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-16 20:07:53 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-16 20:07:53 +0000 |
| commit | 9db57fe78df4ccfbc66b7388a46f2852e10d09ab (patch) | |
| tree | 358337a937892dc42a4b735eb0d5e0608aa8a5da /app-office/openoffice | |
| parent | Stable for x86... (Manifest recommit) (diff) | |
| download | gentoo-2-9db57fe78df4ccfbc66b7388a46f2852e10d09ab.tar.gz gentoo-2-9db57fe78df4ccfbc66b7388a46f2852e10d09ab.tar.bz2 gentoo-2-9db57fe78df4ccfbc66b7388a46f2852e10d09ab.zip | |
Prevent OOo from double installing menu entries, closes bug #53752
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index d723291aedc5..90d71ad83145 100644 --- 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 3df27fb4b19f..875897aa8f80 100644 --- 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 |