diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2005-10-11 18:35:34 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2005-10-11 18:35:34 +0000 |
commit | ddab38ea9dd4bb1eeb9ac56912332789c2c92789 (patch) | |
tree | 0ba0eb9c66fd1dd4c1e54e5575f19a115f5da386 /app-office | |
parent | Marked ~ppc-macos (bug #108593) (diff) | |
download | historical-ddab38ea9dd4bb1eeb9ac56912332789c2c92789.tar.gz historical-ddab38ea9dd4bb1eeb9ac56912332789c2c92789.tar.bz2 historical-ddab38ea9dd4bb1eeb9ac56912332789c2c92789.zip |
Remove the ancient openoffice-bin 1.1.1, see ChangeLog
Package-Manager: portage-2.0.53_rc5
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/openoffice-bin/Manifest | 5 | ||||
-rw-r--r-- | app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 | 271 | ||||
-rw-r--r-- | app-office/openoffice-bin/files/digest-openoffice-bin-1.1.1 | 2 | ||||
-rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild | 208 |
5 files changed, 7 insertions, 486 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index 8004e287d46c..de3c71cd1466 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.102 2005/10/11 06:15:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.103 2005/10/11 18:35:34 suka Exp $ + + 11 Oct 2005; Andreas Proschofsky <suka@gentoo.org> + -files/1.1.1/ooffice-wrapper-1.3, -openoffice-bin-1.1.1.ebuild: + Remove the ancient openoffice-bin 1.1.1 as it has security issues and the + ppc-herd prefers to have it removed, see bug #97907 11 Oct 2005; Andreas Proschofsky <suka@gentoo.org> ChangeLog: Another shot at the icon dir permission problem diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index f2f411b5dc9e..49d422df94a2 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -1,15 +1,12 @@ -MD5 af464eae3498ea411735daba546d337c ChangeLog 18085 -MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166 +MD5 ce67e1757e963ef64c615b4454f92cc3 ChangeLog 18335 MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659 MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 MD5 2919847c6afebe7fd157c48e78fb5770 files/2.0.0/ooo-wrapper2 3703 -MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171 MD5 753fd14ec632a7fe71ab9abef357f93f files/digest-openoffice-bin-1.1.4-r1 141 MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82 MD5 e03d40bf3ce0e7ed62819425202e5849 files/digest-openoffice-bin-2.0.0_rc1 4647 MD5 3b06710458e6c9459598c42fd08598e7 files/digest-openoffice-bin-2.0.0_rc2 4647 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 -MD5 b986cfdd8585ed8adde6bcff8f427361 openoffice-bin-1.1.1.ebuild 5857 MD5 d39203cfa3918278f573580eae65e184 openoffice-bin-1.1.4-r1.ebuild 5006 MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718 MD5 32bfa1358e928e738749074b69cf01f0 openoffice-bin-2.0.0_rc1.ebuild 6665 diff --git a/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 deleted file mode 100644 index 0013d8cebe2b..000000000000 --- a/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 +++ /dev/null @@ -1,271 +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 -PV=<pv> -OOVERSION="OpenOffice.org ${PV}" - -## -## Source system configuration file -## -[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf - -if [ ! -x "$HOME/.openoffice/1.1.1" ] ; then - echo "You are starting this version of OpenOffice.org for the first time" - echo "As the user install has changed again you will have to redo your settings" -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.1 b/app-office/openoffice-bin/files/digest-openoffice-bin-1.1.1 deleted file mode 100644 index 5047adec59f0..000000000000 --- a/app-office/openoffice-bin/files/digest-openoffice-bin-1.1.1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 44065b6125468679a91230b5dd60d9d7 OOo_1.1.1_LinuxIntel_install.tar.gz 79899184 -MD5 986a9373dbe650e4755704e5998f097d OOo_1.1.1_LinuxPowerPC_en_installer.tar.gz 82822922 diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild deleted file mode 100644 index 16901266e54d..000000000000 --- a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2005 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.1.ebuild,v 1.18 2005/08/23 21:16:04 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 ) - ppc? ( http://ftp.sunet.se/pub/Office/OpenOffice.org/contrib/linuxppc/OOo_${PV}_LinuxPowerPC_en_installer.tar.gz )" - -LICENSE="|| ( LGPL-2 SISSL-1.1 )" -SLOT="0" -KEYWORDS="x86 ppc -sparc ~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 )" - -PROVIDE="virtual/ooo" - -src_install() { - # Sandbox issues; bug #8587 - addpredict "/user" - addpredict "/share" - addpredict "/pspfontcache" - addpredict "/usr/bin/soffice" - addpredict "/root/.gconfd" - - # 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 catagory - doins ${kdeloc}/.directory - dodir /usr/share - # Install the icons and mime info - cp -pPR ${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" - einfo -} - |