Fix small issue with the wrapper script

4 files changed, 33 insertions, 27 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index bfb3dcab86c6..ac8070c9d55d 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.20 2003/06/19 21:24:10 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.21 2003/06/20 08:58:17 pauldv Exp $
+
+  20 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta2.ebuild, files/1.1_beta2/ooffice-wrapper-1.3:
+  Fix some errors concerning the versions
 
   19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
   openoffice-bin-1.1_beta-r1.ebuild, openoffice-bin-1.1_beta2.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 0729a31713a7..d306642ec133 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,4 +1,4 @@
-MD5 53f46a3a8b2b766d3c8a753e1cf47d8c ChangeLog 4302
+MD5 e75ddedee19197b607283471bbcbf1e0 ChangeLog 4467
 MD5 583bb2a3fcf66696f1c3c389874b82c9 openoffice-bin-1.0.0-r3.ebuild 2912
 MD5 b221cf945d38e9e31215107f8d084063 openoffice-bin-1.0.1.ebuild 5603
 MD5 7641bbaef9471705b1ed80f92485d707 openoffice-bin-1.0.2.ebuild 6176
@@ -6,7 +6,7 @@ MD5 d75508db43d161514ce1f1288c5d67d2 openoffice-bin-1.0.3.ebuild 6177
 MD5 286e13ebb4c41e2b2a502ac3b12fa6b4 openoffice-bin-1.0.3.1.ebuild 6448
 MD5 4c18a84bc75b5859b4ffd053f8762759 openoffice-bin-1.1_beta-r1.ebuild 6254
 MD5 1d8dc5e17ece7fe099b2297b2fe64d04 openoffice-bin-1.1_beta.ebuild 5963
-MD5 4bd3dd7b3ac4470c65401f5b99e2e6c2 openoffice-bin-1.1_beta2.ebuild 6271
+MD5 9c068210f1dad29882aad1a6683bf9d2 openoffice-bin-1.1_beta2.ebuild 6263
 MD5 9f6fa2caffbec422160157fb68966b37 files/digest-openoffice-bin-1.0.0-r3 82
 MD5 9f9a6ba9924997dd5a42c2b374ea6aa8 files/digest-openoffice-bin-1.0.1 165
 MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
@@ -24,4 +24,4 @@ MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
 MD5 1e2e537056a51b7460f455117d428815 files/1.1_beta/ooffice-wrapper-1.2 8244
 MD5 0d9c11fec5e88f415b8af1ad77e5f452 files/1.1_beta/ooffice-wrapper-1.3 8411
-MD5 02e3541a507a75e3e84ad53e6ca31211 files/1.1_beta2/ooffice-wrapper-1.3 8333
+MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
diff --git a/app-office/openoffice-bin/files/1.1_beta2/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1_beta2/ooffice-wrapper-1.3
index c63866387c23..ba9a2b523d89 100644
--- a/app-office/openoffice-bin/files/1.1_beta2/ooffice-wrapper-1.3
+++ b/app-office/openoffice-bin/files/1.1_beta2/ooffice-wrapper-1.3
@@ -22,7 +22,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
 
 # this string should be exactly as in ~/.sversionrc
-OOVERSION="OpenOffice.org <pv>"
+PV=<pv>
+OOVERSION="OpenOffice.org ${PV//_beta2}"
 
 ##
 ## Source system configuration file
@@ -38,7 +39,7 @@ OOVERSION="OpenOffice.org <pv>"
 ###         3 - ~/.sversionrc exists but no entry found
 get_settings_dir()
 {
-  [ -r ~/.sversionrc ] || exit 1
+  [ -r ${HOME}/.sversionrc ] || exit 1
   # warning, .sversionrc is DOS encoded so strip ^M
   settings_dir="`tr -d  '\r' < ~/.sversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`"
   echo "$settings_dir"
@@ -126,13 +127,13 @@ if [ -z "$OOHOME" ] ; then
 
 #	Do not take old settings as migration results in broken behaviour
 #
-	UPDATEFLAG=""
-    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
+#	UPDATEFLAG=""
+#    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
 #      OOHOME="$oldhome"
-      echo "Using settings from 1.0.3: /${oldhome}"
+#      echo "Using settings from 1.0.3: /${oldhome}"
 #      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
-		UPDATEFLAG="-update:/$oldhome"
-    fi
+#		UPDATEFLAG="-update:/$oldhome"
+#    fi
       # first install
       OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
              sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
@@ -182,21 +183,22 @@ fi
 ## Previous dead installation?
 [ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
 
+# There is no locale import file
 ## Change the ooLocale key in SETUPFILE acording to LOCALE
-TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-	cat >${TMPFILE} <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
- <node oor:name="L10N">
-  <prop oor:name="ooLocale" oor:type="xs:string">
-   <value>$LOCALEOO</value>
-  </prop>
- </node>
-</oor:node>
-EOF
-	ooconfigimport $TMPFILE >dev/null
-	rm -f ${TMPFILE}
-}
+#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
+#	cat >${TMPFILE} <<EOF
+#<?xml version="1.0" encoding="UTF-8"?>
+#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
+# <node oor:name="L10N">
+#  <prop oor:name="ooLocale" oor:type="xs:string">
+#   <value>$LOCALEOO</value>
+#  </prop>
+# </node>
+#</oor:node>
+#EOF
+#	ooconfigimport $TMPFILE >/dev/null
+#	rm -f ${TMPFILE}
+#}
 
 ##
 ## That's it. Launch the beast (with the given args)
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
index e44e06399af3..e755ed20b5a0 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild,v 1.2 2003/06/19 21:24:10 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta2.ebuild,v 1.3 2003/06/20 08:58:17 pauldv Exp $
 
 IUSE="kde gnome"
 
@@ -131,7 +131,7 @@ src_install() {
 	
 	# Install wrapper script
 	exeinto /usr/bin
-	sed -e "s|<pv>|${PV//_beta2}|g" \
+	sed -e "s|<pv>|${PV}|g" \
 		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
 	doexe ${T}/ooffice
 	# Component symlinks