From 213cce24890fc820924d635e193e5b16544b3f95 Mon Sep 17 00:00:00 2001
From: Joel Martin <kanaka@gentoo.org>
Date: Thu, 22 Apr 2004 17:19:31 +0000
Subject: Be more graceful about openoffice (non) existence

---
 app-office/indeview/ChangeLog             |  5 ++++-
 app-office/indeview/Manifest              |  4 ++--
 app-office/indeview/indeview-0.6.5.ebuild | 14 +++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'app-office/indeview')

diff --git a/app-office/indeview/ChangeLog b/app-office/indeview/ChangeLog
index ebd045d84585..da57fb1dcee5 100644
--- a/app-office/indeview/ChangeLog
+++ b/app-office/indeview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/indeview
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.1 2004/04/22 17:00:17 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.2 2004/04/22 17:19:31 kanaka Exp $
+
+  22 Apr 2004; Joel Martin <kanaka@gentoo.org> indeview-0.6.5.ebuild:
+  Be more graceful about openoffice (non) existence
 
 *indeview-0.6.5 (22 Apr 2004)
 
diff --git a/app-office/indeview/Manifest b/app-office/indeview/Manifest
index 55237c967039..b2663ab6f09c 100644
--- a/app-office/indeview/Manifest
+++ b/app-office/indeview/Manifest
@@ -1,4 +1,4 @@
-MD5 87be4743b86541504178037df23b95aa indeview-0.6.5.ebuild 2327
-MD5 ea1a8590c4d4b4c66cdf2e4cc148f378 ChangeLog 362
+MD5 43e4cc4fd3eb9b9a31c9088066586ba8 indeview-0.6.5.ebuild 2624
+MD5 7475b177feb9aaa411817e4b54111c95 ChangeLog 485
 MD5 999957c815f1f66cd06973b1da035051 metadata.xml 218
 MD5 af867adfa8e9bd51546181498d308927 files/digest-indeview-0.6.5 64
diff --git a/app-office/indeview/indeview-0.6.5.ebuild b/app-office/indeview/indeview-0.6.5.ebuild
index 02afe50bb151..f6e0cd481566 100644
--- a/app-office/indeview/indeview-0.6.5.ebuild
+++ b/app-office/indeview/indeview-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.5.ebuild,v 1.1 2004/04/22 17:00:17 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.5.ebuild,v 1.2 2004/04/22 17:19:31 kanaka Exp $
 
 DESCRIPTION="Convert OpenOffice/KOffice to run independently on Linux, OSX, or Windows"
 HOMEPAGE="http://www.indeview.org/"
@@ -61,13 +61,21 @@ src_install() {
 }
 
 pkg_postinst() {
-	grep "IndeViewExport" /opt/OpenOffice.org/share/basic/Tools/script.xlb > /dev/null ||
+	# Add script to OpenOffice macros list
+	grep "IndeViewExport" /opt/OpenOffice.org/share/basic/Tools/script.xlb > /dev/null 2>&1 ||
 		sed -i -e 's;</library:library>; <library:element library:name="IndeViewExport"/>\n</library:library>;' /opt/OpenOffice.org/share/basic/Tools/script.xlb
+
+	echo
+	einfo "If you install or re-install openoffice, "
+	einfo "you will need to re-merge this pacakge."
+	echo
 }
 
 pkg_postrm() {
+	# Delete script from OpenOffice macros list
 	if [ ! -e ${ROOT}/usr/bin/indeview ];
 	then
-		sed -i -e '/^ <library:element library:name="IndeViewExport"\/>$/d' /opt/OpenOffice.org/share/basic/Tools/script.xlb
+		grep "IndeViewExport" /opt/OpenOffice.org/share/basic/Tools/script.xlb > /dev/null 2>&1 &&
+			sed -i -e '/^ <library:element library:name="IndeViewExport"\/>$/d' /opt/OpenOffice.org/share/basic/Tools/script.xlb
 	fi
 }
-- 
cgit v1.2.3-65-gdbad