diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2008-10-21 06:31:16 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2008-10-21 06:31:16 +0000 |
commit | 133bb63914d632e3f5d28a5ff4c4d4704bfb436a (patch) | |
tree | b066e6a3dbf67a9489988f245f443b8a749ea0ab /app-office | |
parent | Version bump. (diff) | |
download | historical-133bb63914d632e3f5d28a5ff4c4d4704bfb436a.tar.gz historical-133bb63914d632e3f5d28a5ff4c4d4704bfb436a.tar.bz2 historical-133bb63914d632e3f5d28a5ff4c4d4704bfb436a.zip |
Fix removal of javaldx on non-java systems, see bug #242844
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo i686
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice-bin/ChangeLog | 6 | ||||
-rw-r--r-- | app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index 3fcfbd44a075..3e261a1f38f7 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.206 2008/10/19 18:25:14 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.207 2008/10/21 06:31:16 suka Exp $ + + 21 Oct 2008; Andreas Proschofsky <suka@gentoo.org> + openoffice-bin-3.0.0.ebuild: + Fix removal of javaldx on non-java systems, see bug #242844 19 Oct 2008; Andreas Proschofsky <suka@gentoo.org> openoffice-bin-3.0.0.ebuild: diff --git a/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild b/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild index a1cd0f3696ab..ba4909921778 100644 --- a/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild,v 1.5 2008/10/19 18:25:14 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0.ebuild,v 1.6 2008/10/21 06:31:16 suka Exp $ inherit eutils fdo-mime rpm multilib @@ -160,7 +160,7 @@ src_install () { sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${D}${INSTDIR}/program/bootstraprc" || die # Non-java weirdness see bug #99366 - use !java && rm -f "${D}${INSTDIR}/program/javaldx" + use !java && rm -f "${D}${INSTDIR}/ure/bin/javaldx" # prevent revdep-rebuild from attempting to rebuild all the time insinto /etc/revdep-rebuild && doins "${FILESDIR}/50-openoffice-bin" |