made a bunch of changes, dep fixes, etc

6 files changed, 264 insertions, 13 deletions

diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 2a40c8f5f972..dd91b95234f5 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,9 +1,9 @@
-MD5 1ff94673ae6e43bf9552b8137908c0c3 openoffice-bin-1.0.2.ebuild 6176
+MD5 7641bbaef9471705b1ed80f92485d707 openoffice-bin-1.0.2.ebuild 6176
 MD5 b221cf945d38e9e31215107f8d084063 openoffice-bin-1.0.1.ebuild 5603
-MD5 6a03c15fcb36d15b0785cf36737baf7f openoffice-bin-1.1_beta.ebuild 5963
-MD5 1690e0d77ae58a24bb998a5c5d108388 openoffice-bin-1.0.3.ebuild 6177
+MD5 1d8dc5e17ece7fe099b2297b2fe64d04 openoffice-bin-1.1_beta.ebuild 5963
+MD5 d75508db43d161514ce1f1288c5d67d2 openoffice-bin-1.0.3.ebuild 6177
 MD5 583bb2a3fcf66696f1c3c389874b82c9 openoffice-bin-1.0.0-r3.ebuild 2912
-MD5 44945f21d9d56b94a3f3ad9bb7dab321 ChangeLog 3329
+MD5 147c5d60710deb8d1d1af8bcc47a3926 ChangeLog 3329
 MD5 9f6fa2caffbec422160157fb68966b37 files/digest-openoffice-bin-1.0.0-r3 82
 MD5 7339447c6b75b9d8cad638a824041ba5 files/digest-openoffice-bin-1.1_beta 84
 MD5 9f9a6ba9924997dd5a42c2b374ea6aa8 files/digest-openoffice-bin-1.0.1 165
diff --git a/app-office/openoffice-bin/files/1.0.3/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.0.3/ooffice-wrapper-1.3
index 1c0c250e8db3..e3cb9e58f2b8 100644
--- a/app-office/openoffice-bin/files/1.0.3/ooffice-wrapper-1.3
+++ b/app-office/openoffice-bin/files/1.0.3/ooffice-wrapper-1.3
@@ -201,8 +201,14 @@ rm -f $SETUPFILE.tmp
 ##
 LANG=$LOCALE
 export LANG
-exec "$OOHOME/soffice" "$@"
-
+case `basename $0` in
+    oosetup) exec "$OOHOME/setup"
+    ;;
+    oopadmin) exec "$OOHOME/spadmin"
+    ;;
+    *) exec "$OOHOME/soffice" "$@"
+    ;;
+esac
 ## Changelog
 # 2003/04/01 halls
 #   * Version 1.0.3
diff --git a/app-office/openoffice-bin/files/1.1_beta/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1_beta/ooffice-wrapper-1.3
new file mode 100644
index 000000000000..e1deb55acf3e
--- /dev/null
+++ b/app-office/openoffice-bin/files/1.1_beta/ooffice-wrapper-1.3
@@ -0,0 +1,245 @@
+#!/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
+OOVERSION="OpenOffice.org 1.1beta"
+
+##
+## 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 ~/.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.conf ] && \
+    grep -q DESTINATIONPATH /etc/openoffice/autoresponse.conf ; then
+    if oldhome="`get_settings_dir "OpenOffice.org 1.0.2"`" ; then
+      OOHOME="$oldhome"
+      echo "Using settings from 1.0.2"
+      /bin/echo -e "OpenOffice.org 1.1beta=file://$oldhome\r" >> ~/.sversionrc
+    else
+      # first install
+      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse.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 -R:/etc/openoffice/autoresponse.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.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"
+
+SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
+mv $SETUPFILE $SETUPFILE.tmp
+
+if ! grep -q "\<ooLocale" $SETUPFILE.tmp ; then
+	# Set ooLocale to nothing in $SETUPFILE. The UI language is handled by LANG.
+	# A good value for ooLocale will be set before starting.
+	cat $SETUPFILE.tmp | \
+	perl -e "while (<>) { /<Office>/ && print \" <L10N>\n  <ooLocale cfg:type=\\\"string\\\"/>\n </L10N>\n\";print \$_;}" > \
+	$SETUPFILE
+	rm -f $SETUPFILE.tmp
+	mv $SETUPFILE $SETUPFILE.tmp
+fi
+
+## Change the ooLocale key in SETUPFILE acording to LOCALE
+cat $SETUPFILE.tmp | \
+  sed 's#<ooLocale\>[^/]*/[^>]*>#<ooLocale cfg:type="string">'$LOCALEOO'</ooLocale>#'\
+  > $SETUPFILE
+rm -f $SETUPFILE.tmp
+
+##
+## 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
diff --git a/app-office/openoffice-bin/openoffice-bin-1.0.2.ebuild b/app-office/openoffice-bin/openoffice-bin-1.0.2.ebuild
index 0d52e11b32bd..ee6dbde11826 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.0.2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.0.2.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.0.2.ebuild,v 1.13 2003/04/10 21:27:10 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.0.2.ebuild,v 1.14 2003/04/19 19:55:45 sethbc Exp $
 
 IUSE="kde gnome"
 
@@ -34,7 +34,7 @@ DEPEND="virtual/glibc
 	virtual/x11
 	app-arch/zip
 	app-arch/unzip
-	>=virtual/jdk-1.3.1
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice"
 
 LICENSE="LGPL-2 | SISSL-1.1"
diff --git a/app-office/openoffice-bin/openoffice-bin-1.0.3.ebuild b/app-office/openoffice-bin/openoffice-bin-1.0.3.ebuild
index 9cc8d1683b0a..86a6af3f781f 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.0.3.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.0.3.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.0.3.ebuild,v 1.2 2003/04/10 21:38:52 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.0.3.ebuild,v 1.3 2003/04/19 19:55:45 sethbc Exp $
 
 IUSE="kde gnome"
 
@@ -34,7 +34,7 @@ DEPEND="virtual/glibc
 	virtual/x11
 	app-arch/zip
 	app-arch/unzip
-	>=virtual/jdk-1.3.1
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice"
 
 LICENSE="LGPL-2 | SISSL-1.1"
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_beta.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_beta.ebuild
index f6af07e9bd8d..306031d2c5d8 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_beta.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_beta.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_beta.ebuild,v 1.3 2003/04/16 18:50:06 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta.ebuild,v 1.4 2003/04/19 19:55:45 sethbc Exp $
 
 IUSE="kde gnome"
 
@@ -34,7 +34,7 @@ DEPEND="virtual/glibc
 	virtual/x11
 	app-arch/zip
 	app-arch/unzip
-	>=virtual/jdk-1.3.1
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice"
 
 LICENSE="LGPL-2 | SISSL-1.1"
@@ -122,7 +122,7 @@ src_install() {
 	# Install wrapper script
 	exeinto /usr/bin
 	sed -e "s|<pv>|${PV}|g" \
-		${FILESDIR}/${PV}/ooffice-wrapper-1.2 > ${T}/ooffice
+		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
 	doexe ${T}/ooffice
 	# Component symlinks
 	dosym ooffice /usr/bin/oocalc