Fresh release
authorAndreas Proschofsky <suka@gentoo.org>
Thu, 23 Dec 2004 14:47:00 +0000 (14:47 +0000)
committerAndreas Proschofsky <suka@gentoo.org>
Thu, 23 Dec 2004 14:47:00 +0000 (14:47 +0000)
app-office/openoffice-bin/ChangeLog
app-office/openoffice-bin/Manifest
app-office/openoffice-bin/files/1.1.4/ooffice-wrapper-1.3 [new file with mode: 0644]
app-office/openoffice-bin/files/digest-openoffice-bin-1.1.4 [new file with mode: 0644]
app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild [new file with mode: 0644]

index 14c61e60b9c9223553e03f584c462ba8d029428a..e8f91921a5a32d8ae519965b5efa4eead3583b88 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.52 2004/11/11 23:30:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.53 2004/12/23 14:47:00 suka Exp $
+
+*openoffice-bin-1.1.4 (23 Dec 2004)
+
+  23 Dec 2004; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/ooffice-wrapper-1.3, +openoffice-bin-1.1.4.ebuild:
+  New release, wrapper updated for smooth transition
 
   12 Nov 2004; suka@gentoo.org openoffice-bin-1.1.1.ebuild,
   openoffice-bin-1.1.3.ebuild:
index 51bed37bcd4a90054367829c0a0e9afd92b76aac..c92f8ea5689fc1391531a2070c4c57df79418136 100644 (file)
@@ -1,8 +1,11 @@
 MD5 a5a59f441829cc23ea6e4eceff7e0826 openoffice-bin-1.1.3.ebuild 5781
+MD5 ab45607ee6b732ae1ee367140e4d0b73 openoffice-bin-1.1.4.ebuild 5783
 MD5 e217dc811c4b802715b1ad51dbb4cbba openoffice-bin-1.1.1.ebuild 5832
-MD5 9bd640c44022e6c35d1a7fe6c9fd1cf4 ChangeLog 8999
+MD5 06e9f37df5ad1654a775698196b2fd46 ChangeLog 9209
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171
 MD5 8d9726b3b029e043fbae1b0249a53daf files/digest-openoffice-bin-1.1.3 82
+MD5 c916d8311a499466ae0401ff064bb539 files/digest-openoffice-bin-1.1.4 82
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
+MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471
diff --git a/app-office/openoffice-bin/files/1.1.4/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1.4/ooffice-wrapper-1.3
new file mode 100644 (file)
index 0000000..bb980f3
--- /dev/null
@@ -0,0 +1,279 @@
+#!/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}"
+
+##
+## Source system configuration file
+##
+[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
+
+# Migration to new user install dir
+if [ -d "$HOME/.openoffice/1.1.3" ] ; then
+     mv $HOME/.openoffice/1.1.3 $HOME/.openoffice/1.1.4
+     sed -i -e s/'.openoffice\/1.1.3'/'.openoffice\/1.1.4'/g $HOME/.sversionrc 
+     sed -i -e s/1.1.3/1.1.4/g $HOME/.openoffice/1.1.4/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.3/1.1.4/g $HOME/.sversionrc
+fi
+
+###
+### 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/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/program/setup ${OOHOME}/setup
+fi
+if [ ! -s $OOHOME/soffice ]; then
+       echo "${OOHOME}/soffice links to nothing, resetting link"
+       ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/soffice
+fi
+if [ ! -s $OOHOME/spadmin ]; then
+       echo "${OOHOME}/spadmin links to nothing, resetting link"
+       ln -sf /opt/OpenOffice.org/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
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-1.1.4 b/app-office/openoffice-bin/files/digest-openoffice-bin-1.1.4
new file mode 100644 (file)
index 0000000..0f34da5
--- /dev/null
@@ -0,0 +1 @@
+MD5 cf2d0beb6cae98acae81e4d690d63094 OOo_1.1.4_LinuxIntel_install.tar.gz 80144225
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
new file mode 100644 (file)
index 0000000..033a241
--- /dev/null
@@ -0,0 +1,206 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.1 2004/12/23 14:47:00 suka Exp $
+
+# NOTE:  There are two big issues that should be addressed.
+#
+#        1)  Language support and fonts should be addressed.
+
+LOC="/opt"
+
+INSTDIR="${LOC}/OpenOffice.org"
+MY_P="OOo_${PV}_LinuxIntel_install"
+use ppc && MY_P="OOo_${PV}_LinuxPowerPC_en_installer"
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="OpenOffice productivity suite"
+HOMEPAGE="http://www.openoffice.org/"
+SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.tar.gz ) \
+                amd64? (mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.tar.gz )"
+
+LICENSE="|| ( LGPL-2  SISSL-1.1 )"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="kde gnome"
+
+DEPEND="sys-apps/findutils
+       virtual/libc
+       >=dev-lang/perl-5.0
+       virtual/x11
+       app-arch/zip
+       app-arch/unzip
+       || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+       !app-office/openoffice
+       amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+RDEPEND="virtual/libc
+       >=dev-lang/perl-5.0
+       virtual/x11
+       app-arch/zip
+       app-arch/unzip
+       || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+       !app-office/openoffice
+       amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+
+src_install() {
+       # Sandbox issues; bug #8587
+       addpredict "/user"
+       addpredict "/share"
+       addpredict "/pspfontcache"
+       addpredict "/usr/bin/soffice"
+       addpredict "/root/.gconfd"
+       addpredict "/opt/OpenOffice.org/foo.tmp"
+       addpredict "/opt/OpenOffice.org/delme"
+
+       # Sandbox issues; bug 8063
+       addpredict "/dev/dri"
+
+       # Autoresponse file for main installation
+       cat > ${T}/rsfile-global <<-"END_RS"
+               [ENVIRONMENT]
+               INSTALLATIONMODE=INSTALL_NETWORK
+               INSTALLATIONTYPE=STANDARD
+               DESTINATIONPATH=<destdir>
+               OUTERPATH=
+               LOGFILE=
+               LANGUAGELIST=<LANGUAGE>
+
+               [JAVA]
+               JavaSupport=preinstalled_or_none
+       END_RS
+
+       # Autoresponse file for user installation
+       cat > ${T}/rsfile-local <<-"END_RS"
+               [ENVIRONMENT]
+               INSTALLATIONMODE=INSTALL_WORKSTATION
+               INSTALLATIONTYPE=WORKSTATION
+               DESTINATIONPATH=<home>/.openoffice/<pv>
+
+               [JAVA]
+               JavaSupport=none
+       END_RS
+
+       # Fixing install location in response file
+       sed -e "s|<destdir>|${D}${INSTDIR}|" \
+               ${T}/rsfile-global > ${T}/autoresponse
+
+       einfo "Installing OpenOffice.org into build root..."
+       dodir ${INSTDIR}
+       cd ${S}
+       ./setup -nogui -v -r:${T}/autoresponse || die "The setup program failed"
+
+       echo
+       einfo "Removing build root from registry..."
+       # Remove totally useless stuff.
+       rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+       # Remove build root from registry and co
+       egrep -rl "${D}" ${D}${INSTDIR}/* | \
+               xargs -i perl -pi -e "s|${D}||g" {} || :
+
+       einfo "Fixing permissions..."
+       # Fix permissions
+       find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
+       chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
+
+       # Fix symlinks
+       for x in "soffice program/spadmin" \
+               "program/setup setup" \
+               "program/spadmin spadmin"
+       do
+               dosym $(echo ${x} | awk '{print $1}') \
+                       ${INSTDIR}/$(echo ${x} | awk '{print $2}')
+       done
+
+       # Install user autoresponse file
+       insinto /etc/openoffice
+       sed -e "s|<pv>|${PV}|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.3 > ${T}/ooffice
+       doexe ${T}/ooffice
+
+       # Component symlinks
+       for app in calc draw impress math writer web setup padmin; do
+               dosym ooffice /usr/bin/oo${app}
+       done
+
+       einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
+       if use gnome
+       then
+               insinto /usr/share/gnome/apps/OpenOffice.org
+               # Install the files needed for the catagory
+               doins ${D}${INSTDIR}/share/gnome/net/.directory
+               doins ${D}${INSTDIR}/share/gnome/net/.order
+
+               # Change this to ooo*.desktop from *.desktop for now, since
+               # otherwise two sets of icons will appear in the GNOME menu.
+               # <brad@gentoo.org> (04 Aug 2003)
+               for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop
+               do
+                       # We have to handle soffice and setup differently
+                       perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+                       perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
+                       # Now fix the rest
+                       perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+                       doins ${x}
+               done
+       fi
+
+       if use kde
+       then
+               local kdeloc="${D}${INSTDIR}/share/kde/net/"
+
+               insinto /usr/share/applnk/OpenOffice.org\ 1.1
+               # Install the files needed for the category
+               doins ${kdeloc}/.directory
+               dodir /usr/share
+               # Install the icons and mime info
+               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
+                       # We have to handle soffice and setup differently
+                       perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+                       perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
+                       # Now fix the rest
+                       perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+                       doins ${x}
+               done
+       fi
+
+
+       # Remove unneeded stuff
+       rm -rf ${D}${INSTDIR}/share/cde
+
+       # Make sure these do not get nuked.
+       keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
+       keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
+       keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+
+       #touch files to make portage uninstalling happy (#22593)
+       find ${D} -type f -exec touch {} \;
+}
+
+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 " To start OpenOffice.org, run:"
+       einfo
+       einfo "   $ ooffice"
+       einfo
+       einfo " Also, for individual components, you can use any of:"
+       einfo
+       einfo "   oocalc, oodraw, ooimpress, oomath, ooweb or oowriter"
+}
+