Fix a stupid version problem

4 files changed, 35 insertions, 27 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 9ab125b5229a..9b02403d0a45 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.21 2003/06/18 19:32:30 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.22 2003/06/20 09:07:57 pauldv Exp $
+
+  20 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1_beta2.ebuild,
+  files/1.1_beta2/ooffice-wrapper-1.3:
+  Fix version problem that slipped through
 
 *openoffice-1.1_beta (18 Jun 2003)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 13199bc60e48..ade64de922c5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,10 +1,10 @@
-MD5 e40e82ef52e89ba6a0fff47174eb3d51 ChangeLog 5531
+MD5 40da3488233b0f14b1ed00bcf748662c ChangeLog 5693
 MD5 142125805450e0dff55c8797670fba2a openoffice-1.0.2-r1.ebuild 18438
 MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
 MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
 MD5 26d9f59c911d655ed5ce40a8c0bd7999 openoffice-1.0.3.ebuild 20926
 MD5 7be2c0518bd82dedf07ccf650e74adcf openoffice-1.0.3-r1.ebuild 21121
-MD5 f9eceaa4fd6ad6c93453c9602dfa0743 openoffice-1.1_beta2.ebuild 17132
+MD5 d383c77d0167af08c9a41b7aab23fd94 openoffice-1.1_beta2.ebuild 17229
 MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2 260
 MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2-r1 260
 MD5 b58bd85a59e18b13fe10d416940da3de files/digest-openoffice-1.0.2-r2 1170
@@ -12,7 +12,7 @@ MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3 330
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
 MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2 198
 MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
-MD5 02e3541a507a75e3e84ad53e6ca31211 files/1.1_beta2/ooffice-wrapper-1.3 8333
+MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
 MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
 MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta2/openoffice-xrender.patch 330
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.2/freetype-2.1.3.patch 1367
diff --git a/app-office/openoffice/files/1.1_beta2/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1_beta2/ooffice-wrapper-1.3
index c63866387c23..ba9a2b523d89 100644
--- a/app-office/openoffice/files/1.1_beta2/ooffice-wrapper-1.3
+++ b/app-office/openoffice/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/openoffice-1.1_beta2.ebuild b/app-office/openoffice/openoffice-1.1_beta2.ebuild
index 6aeb17a4e299..50ad5d2de42f 100644
--- a/app-office/openoffice/openoffice-1.1_beta2.ebuild
+++ b/app-office/openoffice/openoffice-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/openoffice-1.1_beta2.ebuild,v 1.1 2003/06/18 19:32:30 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta2.ebuild,v 1.2 2003/06/20 09:07:57 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -468,7 +468,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
@@ -526,12 +526,14 @@ src_install() {
 	# Unneeded, as they get installed into /usr/share...
 	# They are needed else user installation fails.
 #	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+	rm -rf ${D}${INSTDIR}/share/cde
 #
 #	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
 #		echo 'Categories=Application;Office;' >> ${f}
 #	done
 
 	# Make sure these do not get nuked.
+	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
 	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
 	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }