New beta version added, that compiles, and actually runs too. The binary should be made working soon.

10 files changed, 156 insertions, 311 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e70f08268d2f..9ab125b5229a 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2003/05/25 08:11:53 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.21 2003/06/18 19:32:30 pauldv Exp $
+
+*openoffice-1.1_beta (18 Jun 2003)
+
+  18 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  openoffice-1.1_beta.ebuild, openoffice-1.1_beta2.ebuild:
+  Fix small problem in 1.0.3 ebuild concerning oopadmin not working. Also added
+  a new openoffice-1.1_beta2 ebuild. This obsoletes the never working beta1,
+  which is now removed. Note that beta2 does not build with gcc-3.3.
 
 *openoffice-1.0.3-r1 (25 May 2003)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 3b343d0cb537..13199bc60e48 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,18 +1,20 @@
-MD5 625d18f5a45b2c61eb168a63e3f1627c ChangeLog 5131
+MD5 e40e82ef52e89ba6a0fff47174eb3d51 ChangeLog 5531
 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 2bcfc01a7018c7309e5afe484897f1ba openoffice-1.1_beta.ebuild 16779
-MD5 16489d18a206bdc1d97683f2bf322f7f openoffice-1.0.3-r1.ebuild 21066
-MD5 def872d6eac4352e09801a9d6e703d46 openoffice-1.1_beta2.ebuild 16868
+MD5 7be2c0518bd82dedf07ccf650e74adcf openoffice-1.0.3-r1.ebuild 21121
+MD5 f9eceaa4fd6ad6c93453c9602dfa0743 openoffice-1.1_beta2.ebuild 17132
 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
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3 330
-MD5 370c4f2c49610b60253acee9d14c0c33 files/digest-openoffice-1.1_beta 197
 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 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
 MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper 7460
 MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
@@ -43,7 +45,3 @@ MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
 MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
 MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta/newstlportfix.patch 10531
-MD5 271539dafab707398e9b806eef8f250a files/1.1_beta/ooffice-wrapper-1.2 8220
-MD5 493f30526e1f81cfd4f439b844ce0e0c files/1.1_beta/ooffice-wrapper-1.3 8368
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta/openoffice-xrender.patch 330
diff --git a/app-office/openoffice/files/1.1_beta/ooffice-wrapper-1.2 b/app-office/openoffice/files/1.1_beta/ooffice-wrapper-1.2
deleted file mode 100644
index 5f92769b809c..000000000000
--- a/app-office/openoffice/files/1.1_beta/ooffice-wrapper-1.2
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/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 <pv>"
-
-##
-## 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
-    # 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
-
-    if oldhome="`get_settings_dir "OpenOffice.org 1.0.1"`" ; then
-      OOHOME="$oldhome"
-      echo "Using settings from 1.0.1"
-      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
-    else
-      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
-export LD_PRELOAD=/usr/lib/libfreetype.so
-exec "$OOHOME/soffice" "$@"
-
-## Changelog
-# 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/files/1.1_beta/newstlportfix.patch b/app-office/openoffice/files/1.1_beta2/newstlportfix.patch
index 8d45ac3c2a59..8d45ac3c2a59 100644
--- a/app-office/openoffice/files/1.1_beta/newstlportfix.patch
+++ b/app-office/openoffice/files/1.1_beta2/newstlportfix.patch
diff --git a/app-office/openoffice/files/1.1_beta2/no-mozab.patch b/app-office/openoffice/files/1.1_beta2/no-mozab.patch
new file mode 100644
index 000000000000..14f05c69d0d1
--- /dev/null
+++ b/app-office/openoffice/files/1.1_beta2/no-mozab.patch
@@ -0,0 +1,65 @@
+--- ooo_1.1beta2_test/connectivity/prj/build.lst.orig	2003-06-09 10:57:38.000000000 +0200
++++ ooo_1.1beta2_test/connectivity/prj/build.lst	2003-06-09 10:58:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-cn	connectivity	:	comphelper moz svtools unixODBC NULL
++cn	connectivity	:	comphelper svtools unixODBC NULL
+ cn	connectivity							usr1	-	all	cn_mkout NULL
+ cn	connectivity\source\types				nmake	-	all	cn_types NULL
+ cn	connectivity\source\commontools			nmake	-	all	cn_cmtools cn_parse cn_types NULL
+@@ -7,8 +7,6 @@
+ cn	connectivity\source\resource			nmake	-	all	cn_res NULL
+ cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx cn_types NULL
+ cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
+-cn	connectivity\source\drivers\mozab\mozillasrc		nmake	-	all	cn_mozab_mozillasrc cn_file NULL
+-cn	connectivity\source\drivers\mozab	nmake	-	all	cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
+ cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
+ cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
+ cn	connectivity\source\drivers\mysql		nmake	-	all	cn_mysql cn_dbtools NULL
+--- ooo_1.1beta2_test/scp/source/office/files.scp.orig	2003-06-09 11:00:47.000000000 +0200
++++ ooo_1.1beta2_test/scp/source/office/files.scp	2003-06-09 11:01:51.000000000 +0200
+@@ -394,16 +394,6 @@
+     Dir             = GID_DIR_PROGRAM;
+ 	Styles			= (PACKED);
+ End
+-File GID_FILE_LIB_MOZABDRV
+-	TXT_FILE_BODY;
+-	#ifdef UNX
+-    Name            = "libmozabdrv2.so";
+-	#else
+-    Name            = "mozabdrv2.dll";
+-	#endif
+-    Dir             = GID_DIR_PROGRAM;
+-	Styles			= (PACKED);
+-End
+ 
+ 
+ STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
+@@ -755,17 +745,6 @@
+         #endif
+ End
+ 
+-File GID_FILE_LIB_MOZAB_2
+-        TXT_FILE_BODY;
+-        Styles          = (PACKED,UNO_COMPONENT);
+-        RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
+-        Dir             = GID_DIR_PROGRAM;
+-        #ifdef UNX
+-        Name            = "libmozab2.so";
+-        #else
+-        Name            = "mozab2.dll";
+-        #endif
+-End
+ 
+ File GID_FILE_LIB_SDBC_2
+         TXT_FILE_BODY;
+@@ -3040,10 +3019,4 @@
+ 
+ #endif                                  // of #ifdef SOLAR_JAVA
+ 
+-File GID_FILE_MOZILLA_RUNTIME
+-        BIN_FILE_BODY;
+-        Styles = (ARCHIVE);
+-        Dir    = GID_DIR_PROGRAM;
+-        Name	= "mozruntime.zip";
+-End
+ 
diff --git a/app-office/openoffice/files/1.1_beta/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1_beta2/ooffice-wrapper-1.3
index e1deb55acf3e..c63866387c23 100644
--- a/app-office/openoffice/files/1.1_beta/ooffice-wrapper-1.3
+++ b/app-office/openoffice/files/1.1_beta2/ooffice-wrapper-1.3
@@ -22,7 +22,7 @@
 # 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"
+OOVERSION="OpenOffice.org <pv>"
 
 ##
 ## Source system configuration file
@@ -121,15 +121,20 @@ 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
+  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.conf | \
+      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
              sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
 
       if [ -d "$OOHOME" ]; then
@@ -140,19 +145,19 @@ if [ -z "$OOHOME" ] ; then
       fi
 
       echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org<pv>/program/setup -R:/etc/openoffice/autoresponse.conf >& /dev/null; then
+      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
+#    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 "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
     echo "This file should contain DESTINATIONPATH"
     exit 1
   fi
@@ -177,24 +182,21 @@ 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
+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/files/1.1_beta/openoffice-xrender.patch b/app-office/openoffice/files/1.1_beta2/openoffice-xrender.patch
index 0995fc5c204f..0995fc5c204f 100644
--- a/app-office/openoffice/files/1.1_beta/openoffice-xrender.patch
+++ b/app-office/openoffice/files/1.1_beta2/openoffice-xrender.patch
diff --git a/app-office/openoffice/files/digest-openoffice-1.1_beta b/app-office/openoffice/files/digest-openoffice-1.1_beta2
index c56ff802e0ef..104907d86431 100644
--- a/app-office/openoffice/files/digest-openoffice-1.1_beta
+++ b/app-office/openoffice/files/digest-openoffice-1.1_beta2
@@ -1,3 +1,3 @@
-MD5 947e1a6d537ee37d8177a307a0e4b482 OOo_1.1beta_source.tar.bz2 187999457
+MD5 c1d9a96fa644968a76f9b4fbd3f18cf2 OOo_1.1beta2_source.tar.bz2 166018743
 MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
 MD5 09775a4111e066f782866d8a57d8481b freetype-2.1.3.tar.bz2 790213
diff --git a/app-office/openoffice/openoffice-1.0.3-r1.ebuild b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
index 457e8ac6373b..d78e99de82ee 100644
--- a/app-office/openoffice/openoffice-1.0.3-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.0.3-r1.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.0.3-r1.ebuild,v 1.1 2003/05/25 08:11:53 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.2 2003/06/18 19:32:30 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -578,6 +578,10 @@ src_install() {
 	sed -e "s|<pv>|${PV}|g" \
 		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
 	doexe ${T}/ooffice
+	sed -e "s|/soffice|/spadmin|g" \
+		${T}/ooffice > ${T}/oopadmin
+	doexe ${T}/oopadmin
+	
 	# Component symlinks
 	dosym ooffice /usr/bin/oocalc
 	dosym ooffice /usr/bin/oodraw
@@ -585,7 +589,6 @@ src_install() {
 	dosym ooffice /usr/bin/oomath
 	dosym ooffice /usr/bin/oowriter
 	dosym ooffice /usr/bin/oosetup
-	dosym ooffice /usr/bin/oopadmin
 
 	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
 	if [ -n "`use gnome`" ]
diff --git a/app-office/openoffice/openoffice-1.1_beta.ebuild b/app-office/openoffice/openoffice-1.1_beta2.ebuild
index aa223361b72c..6aeb17a4e299 100644
--- a/app-office/openoffice/openoffice-1.1_beta.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_beta.ebuild,v 1.4 2003/04/09 23:12:17 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta2.ebuild,v 1.1 2003/06/18 19:32:30 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -53,10 +53,11 @@ FT_VER="2.1.3"
 STLP_VER="4.5.3"
 MY_PV="${PV/_/}"
 INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${MY_PV}_src"
+S="${WORKDIR}/ooo_${MY_PV}_src"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 SRC_URI="http://ny1.mirror.openoffice.org/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2
 	http://sf1.mirror.openoffice.org/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2
+	http://niihau.student.utwente.nl/openoffice/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2
 	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
 	mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2"
 HOMEPAGE="http://www.openoffice.org/"
@@ -92,7 +93,7 @@ pkg_setup() {
 	if [ "$(gcc-version)" != "3.2" ]
 	then
 		eerror
-		eerror "This build needs gcc-3.2 or later, but due to profile"
+		eerror "This build needs gcc-3.2.x, but due to profile"
 		eerror "settings, it cannot DEPEND on it, so please merge it"
 		eerror "manually:"
 		eerror
@@ -102,8 +103,8 @@ pkg_setup() {
 		eerror "gcc-3.2.  Thus if there is already a gcc-3.2.1-r2 out, use this"
 		eerror "rather than 3.2.1, etc."
 		eerror
-		eerror "As of writing, gcc-3.2.1 seemed to create the most stable builds."
-		eerror "Also, because OO is such a complex build, ONLY gcc-3.2.1 will be"
+		eerror "As of writing, gcc-3.2.3-r1 seemed to create the most stable builds."
+		eerror "Also, because OO is such a complex build, ONLY gcc-3.2.3-r1 will be"
 		eerror "supported!"
 		eerror
 		eerror "This process is not highly recomended, as upgrading your compiler"
@@ -162,7 +163,7 @@ oo_setup() {
 			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
 
 			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ]
+			if [ "$(gcc-version)" != "3.2" ] 
 			then
 				# See if we can get a gcc profile we know is proper ...
 				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -203,8 +204,9 @@ src_unpack() {
 	rm STLport-4.5.3.patch
 	epatch ${FILESDIR}/${PV}/newstlportfix.patch
 	cd ${S}
-	epatch ${FILESDIR}/${PV}/openoffice-xrender.patch
-	
+	epatch ${FILESDIR}/${PV}/no-mozab.patch
+
+
 	# Now for our optimization flags ...
 	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
 		${S}/solenv/inc/unxlngi3.mk
@@ -236,7 +238,7 @@ get_EnvSet() {
 }
 
 src_compile() {
-
+	addpredict /bin
 	local buildcmd=""
 
 	oo_setup
@@ -256,6 +258,17 @@ src_compile() {
 		export CXX="/usr/bin/ccache/ccache ${CXX}"
 	fi
     
+	# Enable new ccache for this build 
+	if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
+	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
+	     -x /usr/bin/ccache ]
+	then
+		# Build uses its own env with $PATH, etc, so
+		# we take the easy way out. (Az)
+		export CC="/usr/bin/ccache ${CC}"
+		export CXX="/usr/bin/ccache ${CXX}"
+	fi
+    
 	# Enable distcc for this build (Az)
 	if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
 	     "${FEATURES/distcc/}" != "${FEATURES}" -a \
@@ -364,6 +377,9 @@ src_install() {
 	addpredict "/user"
 	addpredict "/share"
 	addpredict "/dev/dri"
+	addpredict "/usr/bin/soffice"
+	addpredict "/pspfontcache"	
+
 	# This allows us to change languages without editing the ebuild.
 	#
 	#   languages1="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS"
@@ -447,13 +463,13 @@ src_install() {
 
 	# Install user autoresponse file
 	insinto /etc/openoffice
-	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse.conf
-	doins ${T}/autoresponse.conf
+	sed -e "s|<pv>|${PV//_beta2}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
+	doins ${T}/autoresponse-${PV}.conf
 	
 	# Install wrapper script
 	exeinto /usr/bin
-	sed -e "s|<pv>|${PV}|g" \
-		${FILESDIR}/${PV}/ooffice-wrapper-1.2 > ${T}/ooffice
+	sed -e "s|<pv>|${PV//_beta2}|g" \
+		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
 	doexe ${T}/ooffice
 	# Component symlinks
 	dosym ooffice /usr/bin/oocalc
@@ -484,10 +500,10 @@ src_install() {
 
 	if [ -n "`use kde`" ]
 	then
-		local kdeloc="${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org${PV}"
+		local kdeloc="${D}${INSTDIR}/share/kde/net/"
 	
 		# Portage do not work with the space ..
-		mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV} ${kdeloc}
+#		mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV//_beta/Beta} ${kdeloc}
 		
 		insinto /usr/share/applnk/OpenOffice.org
 		# Install the files needed for the catagory
@@ -495,7 +511,7 @@ src_install() {
 		doins ${kdeloc}/.order
 		dodir /usr/share
 		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
+		cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 		
 		for x in ${kdeloc}/*.desktop
 		do
@@ -508,27 +524,18 @@ src_install() {
 	fi
 
 	# Unneeded, as they get installed into /usr/share...
-	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
-
-	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
-		echo 'Categories=Application;Office;' >> ${f}
-	done
+	# They are needed else user installation fails.
+#	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+#
+#	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/config/registry/instance/org/openoffice/{Office,ucb}
 	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
 	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }
 
-pkg_preinst() {
-
-	# The one with OO-1.0.0 was not valid
-	if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
-	then
-		rm -f ${ROOT}/etc/openoffice/autoresponse.conf
-	fi
-}
-
 pkg_postinst() {
 
 	einfo "******************************************************************"