Move the oowrapper over from app-office/openoffice

4 files changed, 44 insertions, 6 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 4d1f5e5beb65..79207bb01894 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.27 2003/08/02 08:29:09 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.28 2003/08/04 15:48:20 brad Exp $
+
+  04 Aug 2003; Brad Laue <brad@gentoo.org> files/1.1_rc2/ooffice-wrapper-1.3:
+  Copy ooffice-wrapper over from app-office/openoffice, as it will properly
+  launch OpenOffice when only the minor or RC revision has changed.
 
 *openoffice-bin-1.1_rc2 (02 Aug 2003)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index dbb4a4d01a49..b75656b81720 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,4 +1,4 @@
-MD5 cafb092c4ba696a1018de16ba5d21d59 ChangeLog 5566
+MD5 6f967c35c22761414765b3bfa7aa050f ChangeLog 5789
 MD5 98d48815cb1b470eaa680bee025cd825 openoffice-bin-1.0.2.ebuild 6174
 MD5 286e13ebb4c41e2b2a502ac3b12fa6b4 openoffice-bin-1.0.3.1.ebuild 6448
 MD5 7576a51aef82508612fa18256c0e7c85 openoffice-bin-1.0.3.ebuild 6167
@@ -15,5 +15,5 @@ MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper-1.1 7460
 MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
 MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
-MD5 aa029b80898982ee46719f9200c41429 files/1.1_rc1/ooffice-wrapper-1.3 8407
-MD5 611fe4d428092a279bcd122fd6d57e88 files/1.1_rc2/ooffice-wrapper-1.3 8407
+MD5 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
+MD5 71a61edc7e10812d8a534d3e67394a26 files/1.1_rc2/ooffice-wrapper-1.3 8978
diff --git a/app-office/openoffice-bin/files/1.1_rc1/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1_rc1/ooffice-wrapper-1.3
index e587fc7135f9..ecd541af9bae 100644
--- a/app-office/openoffice-bin/files/1.1_rc1/ooffice-wrapper-1.3
+++ b/app-office/openoffice-bin/files/1.1_rc1/ooffice-wrapper-1.3
@@ -146,7 +146,7 @@ if [ -z "$OOHOME" ] ; then
       fi
 
       echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org<pv>/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+      if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
         echo "setup failed.. abort"
         exit 1
       fi
@@ -200,6 +200,23 @@ fi
 #	rm -f ${TMPFILE}
 #}
 
+# Check whether the programs actually link to anything, or are from an old
+# version.
+
+if [ ! -s $OOHOME/setup ]; then
+	echo "${OOHOME}/setup links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup
+fi
+if [ ! -s $OOHOME/soffice ]; then
+	echo "${OOHOME}/soffice links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice
+fi
+if [ ! -s $OOHOME/spadmin ]; then
+	echo "${OOHOME}/spadmin links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin
+fi
+
+
 ##
 ## That's it. Launch the beast (with the given args)
 ##
diff --git a/app-office/openoffice-bin/files/1.1_rc2/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1_rc2/ooffice-wrapper-1.3
index e439a5a81459..b389658133ed 100644
--- a/app-office/openoffice-bin/files/1.1_rc2/ooffice-wrapper-1.3
+++ b/app-office/openoffice-bin/files/1.1_rc2/ooffice-wrapper-1.3
@@ -146,7 +146,7 @@ if [ -z "$OOHOME" ] ; then
       fi
 
       echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org<pv>/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+      if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
         echo "setup failed.. abort"
         exit 1
       fi
@@ -200,6 +200,23 @@ fi
 #	rm -f ${TMPFILE}
 #}
 
+# Check whether the programs actually link to anything, or are from an old
+# version.
+
+if [ ! -s $OOHOME/setup ]; then
+	echo "${OOHOME}/setup links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup
+fi
+if [ ! -s $OOHOME/soffice ]; then
+	echo "${OOHOME}/soffice links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice
+fi
+if [ ! -s $OOHOME/spadmin ]; then
+	echo "${OOHOME}/spadmin links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin
+fi
+
+
 ##
 ## That's it. Launch the beast (with the given args)
 ##