Version bump to 1.1_rc3

3 files changed, 281 insertions, 6 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 79207bb01894..f803de8a2cfa 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2003/08/04 15:48:20 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.29 2003/08/17 12:47:52 tad Exp $
+
+*openoffice-bin-1.1_rc3 (17 Aug 2003)
+
+  17 Aug 2003; Troy Dack <tad@gentoo.org> openoffice-bin-1.1_rc3.ebuild,
+  files/1.1_rc3/ooffice-wrapper-1.3:
+  Add 1.1_rc3
 
   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
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index dac58d4c0c6f..256667b6b925 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,19 +1,22 @@
-MD5 6f967c35c22761414765b3bfa7aa050f ChangeLog 5789
+MD5 87cdcf3dcef19c66ccfd76ef09dbfc85 openoffice-bin-1.1_rc2.ebuild 6344
 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
-MD5 1d4d7e2d4125513818b334f9be8a9dcb openoffice-bin-1.1_beta2-r1.ebuild 6285
 MD5 56ef01c9cde2c8d14a33456381be87a5 openoffice-bin-1.1_rc1.ebuild 6345
-MD5 87cdcf3dcef19c66ccfd76ef09dbfc85 openoffice-bin-1.1_rc2.ebuild 6344
+MD5 ff7eb4a7e3f2d9c38ae0eb284a61946b openoffice-bin-1.1_rc3.ebuild 6376
+MD5 1d4d7e2d4125513818b334f9be8a9dcb openoffice-bin-1.1_beta2-r1.ebuild 6285
+MD5 7576a51aef82508612fa18256c0e7c85 openoffice-bin-1.0.3.ebuild 6167
+MD5 6f967c35c22761414765b3bfa7aa050f ChangeLog 5789
+MD5 b53b5b274336275ed73675bae1fc5dfc files/digest-openoffice-bin-1.1_beta2-r1 85
 MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
 MD5 7f69df73d15c5fca3829e9f3083cf440 files/digest-openoffice-bin-1.0.3 82
 MD5 94e303d234eb28b21c53aefdc9f8f19f files/digest-openoffice-bin-1.0.3.1 145
-MD5 b53b5b274336275ed73675bae1fc5dfc files/digest-openoffice-bin-1.1_beta2-r1 85
 MD5 b9403876e52d7b6b1323dd661ce2af8f files/digest-openoffice-bin-1.1_rc1 82
 MD5 9fa0b4176adec870a2f3edf4611c36f5 files/digest-openoffice-bin-1.1_rc2 83
+MD5 fbeb4316c33a24a257ee9e9bb6429157 files/digest-openoffice-bin-1.1_rc3 83
 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 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
 MD5 71a61edc7e10812d8a534d3e67394a26 files/1.1_rc2/ooffice-wrapper-1.3 8978
+MD5 de5b390a5082cb414ed6fcc5ca12ec5c files/1.1_rc3/ooffice-wrapper-1.3 8978
diff --git a/app-office/openoffice-bin/files/1.1_rc3/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1_rc3/ooffice-wrapper-1.3
new file mode 100644
index 000000000000..dd8ecdd04e25
--- /dev/null
+++ b/app-office/openoffice-bin/files/1.1_rc3/ooffice-wrapper-1.3
@@ -0,0 +1,266 @@
+#!/bin/sh
+#
+# Wrapper script for openoffice
+#
+# (C) Peter 'Nidd' Novodvorsky, 2001,2002
+# (C) Martin 'empty' Quinson, 2002.
+#     Modifications by Chris Halls
+#     Modifications by Lucien Saviot
+
+# This program is free software; you can redistribute it and/or modify         
+# it under the terms of the GNU General Public License as published by         
+# the Free Software Foundation; either version 2 of the License, or            
+# (at your option) any later version.                                          
+#                                                                             
+# This program is distributed in the hope that it will be useful,              
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             
+# General Public License for more details.                                     
+#                                                                             
+# You should have received a copy of the GNU General Public License            
+# along with this program; if not, write to the Free Software                  
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
+
+# this string should be exactly as in ~/.sversionrc
+PV=<pv>
+OOVERSION="OpenOffice.org ${PV//_rc3}"
+
+##
+## Source system configuration file
+##
+[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
+
+###
+### Get user settings directory from ~/.sversionrc and echo directory name to stdout
+### get_settings_dir <Version>
+### return: 0 - directory found, 
+###         1 - ~/.sversionrc non existent
+###         2 - entry exists in ~/.sversionrc but directory not found
+###         3 - ~/.sversionrc exists but no entry found
+get_settings_dir()
+{
+  [ -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"
+  [ -n "$settings_dir" ] || exit 3
+  [ -d "$settings_dir" ] || exit 2
+}
+
+##
+## where does OO live for this user ?
+##
+OOHOME="`get_settings_dir "$OOVERSION"`"
+if [ $? -eq 2 ] ; then
+  # .sversionrc contains a version yet the directory does not exist
+    echo "I'm confused because I can't find OpenOffice's user files."
+    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
+    echo "but they are not. Please fix the situation manually."
+    echo "You may want to edit ~/.sversionrc to indicate where is OO"
+    echo "installed, or remove it if you did remove your installation"
+    echo "directory manually (you bad one)."
+    exit 1
+fi
+
+##
+## Unset SESSION_MANAGER if gnome-session is the session manager
+## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
+##
+SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
+if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
+
+  SESMGR="`readlink -f /proc/$SMPID/exe`"
+  case "$SESMGR" in
+      /usr/bin/gnome-session*)
+      echo "Gnome session manager detected - session management disabled"
+      unset SESSION_MANAGER
+      ;;
+  esac
+fi
+
+##
+## Add known Debian fonts locations to search path
+##
+## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other
+## paths.
+##
+
+# Default font path.  This is used if SAL_FONTPATH_USER is not defined.
+DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\
+/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\
+/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\
+/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\
+/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\
+/usr/lib/X11/fonts/TrueType;\
+/usr/share/fonts/truetype/kochi;\
+/usr/lib/X11/fonts/TrueType/larabie-straight;\
+/usr/lib/X11/fonts/TrueType/larabie-uncommon"
+
+SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"}
+export SAL_FONTPATH_USER
+
+## search LOCALE
+if [ -n "$LC_ALL" ]; then
+  LOCALE="$LC_ALL"
+  # OOo doesn't understand LC_ALL, so set LANG
+  LANG="$LC_ALL"
+elif [ -n "$LANG" ]; then
+  LOCALE="$LANG"
+elif [ -n "$LC_MESSAGES" ]; then
+  LOCALE="$LC_MESSAGES"
+  LANG="$LC_MESSAGES"
+else
+  LOCALE="en_US"
+fi
+
+# Set locale to en_US if locale is C
+if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
+
+LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
+
+##
+## install OO for this user if needed
+##
+if [ -z "$OOHOME" ] ; then
+  if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
+    grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
+
+#	Do not take old settings as migration results in broken behaviour
+#
+#	UPDATEFLAG=""
+#    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
+#      OOHOME="$oldhome"
+#      echo "Using settings from 1.0.3: /${oldhome}"
+#      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
+#		UPDATEFLAG="-update:/$oldhome"
+#    fi
+      # first install
+      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
+             sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
+
+      if [ -d "$OOHOME" ]; then
+        echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
+        echo "yet the directory $OOHOME exists." 
+        echo "Please remove $OOHOME and try again."
+        exit 1
+      fi
+
+      echo "running openoffice.org setup..."
+      if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+        echo "setup failed.. abort"
+        exit 1
+      fi
+
+
+#    fi
+    
+    echo "Setup complete.  Running openoffice.org..."
+
+else
+    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
+    echo "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
+    echo "This file should contain DESTINATIONPATH"
+    exit 1
+  fi
+fi
+
+##
+## If no file is specified on the command line, which application to start?  
+## The wrapper can be called from several links in /usr/bin
+##
+if [ $# = 0 ]; then
+  case `basename $0` in
+    oocalc) set -- private:factory/scalc;;
+    oodraw) set -- private:factory/sdraw;;
+    ooimpress) set -- private:factory/simpress;;
+    oomath) set -- private:factory/smath;;
+    oowriter) set -- private:factory/swriter;;
+    oohtml) set -- private:factory/swriter/web;;
+    oomaster) set -- private:factory/swriter/Global;;
+  esac
+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}
+#}
+
+# 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)
+##
+LANG=$LOCALE
+export LANG
+case `basename $0` in
+    oosetup) exec "$OOHOME/setup"
+    ;;
+    oopadmin) exec "$OOHOME/spadmin"
+    ;;
+    *) exec "$OOHOME/soffice" "$@"
+    ;;
+esac
+## Changelog
+# 2003/04/01 halls
+#   * Version 1.1beta
+# 2003/02/03 halls
+#   * Check for nonexistent ooLocale every run
+# 2003/01/09 halls
+#   * Version 1.0.2
+# 12/15 saviot
+#   * Change ooLocale at startup in Setup.xml
+#   <ooLocale cfg:type="string"/> doesn't work for help.
+# 12/03 challs
+#   * Add Debian font paths to user font path
+# 11/14 saviot
+#   * correct handling of UI language
+#   * don't change Linguistic.xml after first startup(#168780)
+#   * TODO: provide better defaults on first startup
+# 10/03 challs
+#   * Fix use with LC_ALL
+# 07/10 challs
+#   * use 1.0.1 directory and improve error checking
+# 07/02 challs
+#   * use readlink in /proc/PID/exe to get
+#     real session manager name
+# 06/12 challs
+#   * merge into main package
+#   * change $@ to "$@"
+#   * source configuration file: 
+#       /etc/openoffice/openoffice.conf
+# 06/12 mquinson
+#   * strace only when DEBUG is set to yes
+#   * readd the $@ to pass the args to soffice
+# 06/06 mquinson
+#   * Make sure the OLDLOCALE is never empty
+#   * handle the case where the locale is C