Clean up the wrapper

Package-Manager: portage-2.0.51-r14

3 files changed, 8 insertions, 106 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index c3b1ef704c02..9a591d025f38 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.100 2005/01/22 16:01:18 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.101 2005/01/23 10:07:51 suka Exp $
+
+  23 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/xooffice-wrapper-1.3:
+  clean up the wrapper file
 
   22 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-ximian-1.3.7.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index b2bf9ca6439b..f2a8f8138dd5 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
 MD5 981121820dd0442f8eef8ee4c8e99a31 openoffice-ximian-1.3.7.ebuild 17810
-MD5 9602570b7fd1e0355cf7f5837684b1e8 ChangeLog 24927
+MD5 4a7114cff419ad89db0778c7ae4da41c ChangeLog 25045
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
@@ -23,7 +23,7 @@ MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
 MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449
-MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
+MD5 31195ec00e35ae9bb4c7b9d86d4c2ae1 files/1.1.3/xooffice-wrapper-1.3 5983
 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
diff --git a/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3
index 78a7a18dd008..f4bd892efb0b 100644
--- a/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3
+++ b/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3
@@ -70,43 +70,6 @@ if [ $? -eq 2 ] ; then
     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"
@@ -133,16 +96,6 @@ if [ -z "$OOHOME" ] ; then
   if [ -e /etc/ximian-openoffice/autoresponse-<pv>.conf ] && \
     grep -q DESTINATIONPATH /etc/ximian-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" >> ~/.xversionrc
-#		UPDATEFLAG="-update:/$oldhome"
-#    fi
-
       # first install
       OOHOME=`grep DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf | \
              sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
@@ -159,7 +112,6 @@ if [ -z "$OOHOME" ] ; then
         echo "setup failed.. abort"
         exit 1
       fi
-
  
     echo "Setup complete.  Running openoffice.org..."
 
@@ -181,8 +133,8 @@ if [ $# = 0 ]; then
     xoodraw) set -- private:factory/sdraw;;
     xooimpress) set -- private:factory/simpress;;
     xoomath) set -- private:factory/smath;;
+    xooweb) set -- private:factory/swriter/web;;
     xoowriter) set -- private:factory/swriter;;
-    xoohtml) set -- private:factory/swriter/web;;
     xoomaster) set -- private:factory/swriter/Global;;
   esac
 fi
@@ -190,26 +142,6 @@ fi
 ## Previous dead installation?
 [ -d $HOME/.xopenoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.xopenoffice/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/Ximian-OpenOffice/program/setup ${OOHOME}/setup
@@ -237,37 +169,3 @@ case `basename $0` in
     *) 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