summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-09-10 08:30:30 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-09-10 08:30:30 +0000
commit8926c859ae967d78f2abece5db8bc8c21b4d3979 (patch)
tree186051deb16c10b4bf148724937d5dc375be27c0 /app-office
parentFix #102088. (diff)
downloadgentoo-2-8926c859ae967d78f2abece5db8bc8c21b4d3979.tar.gz
gentoo-2-8926c859ae967d78f2abece5db8bc8c21b4d3979.tar.bz2
gentoo-2-8926c859ae967d78f2abece5db8bc8c21b4d3979.zip
Fix startup problems on non-java systems, see bug #99366
(Portage version: 2.0.52-r1)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-bin/ChangeLog6
-rw-r--r--app-office/openoffice-bin/openoffice-bin-1.9.128.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index c87628e9fb8d..5b44866d7435 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.88 2005/09/10 08:09:21 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.89 2005/09/10 08:30:30 suka Exp $
+
+ 10 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-bin-1.9.128.ebuild:
+ Fix startup problems on non-java systems, see bug #99366
10 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
openoffice-bin-1.9.128.ebuild:
diff --git a/app-office/openoffice-bin/openoffice-bin-1.9.128.ebuild b/app-office/openoffice-bin/openoffice-bin-1.9.128.ebuild
index c140657fada4..f6eea6078d63 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.9.128.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.9.128.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.9.128.ebuild,v 1.2 2005/09/10 08:09:21 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.128.ebuild,v 1.3 2005/09/10 08:30:30 suka Exp $
inherit eutils fdo-mime rpm versionator
@@ -134,8 +134,12 @@ src_install () {
# Change user install dir
sed -i -e s/.openoffice.org${PV}/.ooo-2.0-pre/g ${D}${INSTDIR}/program/bootstraprc || die
+
# Fixing some icon dir permissions
chmod +r -R ${D}/usr/share/icons/ || die
+
+ # Non-java weirdness see bug #99366
+ use java || rm -f ${D}${INSTDIR}/program/javaldx
}
pkg_postinst() {