From a6bedf2b0b7297096bd6fd11002ccc7ff6b9066e Mon Sep 17 00:00:00 2001
From: Andreas Proschofsky <suka@gentoo.org>
Date: Thu, 1 Apr 2004 12:02:51 +0000
Subject: Removing user settings migration stuff, does not work

---
 app-office/openoffice/ChangeLog                       |  8 +++++++-
 app-office/openoffice/files/1.1.1/ooffice-wrapper-1.3 | 15 +++------------
 app-office/openoffice/openoffice-1.1.1.ebuild         |  5 ++---
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'app-office/openoffice')

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 32ce1737d1d2..65868dad4b43 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.62 2004/03/31 09:01:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.63 2004/04/01 12:02:51 suka Exp $
+
+  01 Apr 2004; suka@gentoo.org openoffice-1.1.1.ebuild,
+  files/1.1.1/ooffice-wrapper-1.3:
+  User settings migration does not work as there have been some changes to the
+  user install :-( Removing the migration stuff, you will have to redo your
+  settings after upgrade
 
 *openoffice-1.1.1 (31 Mar 2004)
 
diff --git a/app-office/openoffice/files/1.1.1/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.1/ooffice-wrapper-1.3
index 3cc043f2ceed..0013d8cebe2b 100644
--- a/app-office/openoffice/files/1.1.1/ooffice-wrapper-1.3
+++ b/app-office/openoffice/files/1.1.1/ooffice-wrapper-1.3
@@ -30,18 +30,9 @@ OOVERSION="OpenOffice.org ${PV}"
 ##
 [ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
 
-# Migration to new user install dir
-if [ -d "$HOME/.openoffice/1.1.0" ] ; then
-     mv $HOME/.openoffice/1.1.0 $HOME/.openoffice/1.1
-     sed -i -e s/'.openoffice\/1.1.0'/'.openoffice\/1.1'/g $HOME/.sversionrc 
-     sed -i -e s/org1.1.0/org/g $HOME/.openoffice/1.1/user/basic/*.xlc
-     sed -i -e s/1.1.0/1.1/g $HOME/.openoffice/1.1/user/basic/*.xlc
-     echo "Your user install dir has been moved over to the new version"
-fi
-
-#Make smooth up- and downgrading between minor versions possible
-if [ -e "$HOME/.sversionrc" ] ; then
-     sed -i -e s/1.1.0/1.1.1/g $HOME/.sversionrc
+if [ ! -x "$HOME/.openoffice/1.1.1" ] ; then
+     echo "You are starting this version of OpenOffice.org for the first time"
+     echo "As the user install has changed again you will have to redo your settings"
 fi
 
 ###
diff --git a/app-office/openoffice/openoffice-1.1.1.ebuild b/app-office/openoffice/openoffice-1.1.1.ebuild
index 0529a52d826f..e3431e0c02f8 100644
--- a/app-office/openoffice/openoffice-1.1.1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1.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/openoffice/openoffice-1.1.1.ebuild,v 1.1 2004/03/31 09:01:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1.ebuild,v 1.2 2004/04/01 12:02:51 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -51,7 +51,6 @@ export WANT_GCC_3="yes"
 
 LOC="/opt"
 INSTDIR="${LOC}/OpenOffice.org"
-MY_PV="${PV/.1}"
 S="${WORKDIR}/oo_${PV}_src"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.bz2
@@ -440,7 +439,7 @@ src_install() {
 
 	# Install user autoresponse file
 	insinto /etc/openoffice
-	sed -e "s|<pv>|${MY_PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
+	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
 	doins ${T}/autoresponse-${PV}.conf
 
 	# Install wrapper script
-- 
cgit v1.2.3-65-gdbad