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-bin | |
| 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-bin')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index d186258abe7c..b3cb09049b5d 100644 --- 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 ee95b1d8b781..8ca45f02f77c 100644 --- 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:" |