Get rid of the wrapper script

Package-Manager: portage-2.1.3.7

5 files changed, 25 insertions, 150 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index a60ba1f90405..47edc14528de 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.170 2007/09/04 19:17:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.171 2007/09/04 21:09:27 suka Exp $
+
+  04 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.3.0_rc1/50-openoffice-bin, -files/2.3.0_rc1/ooo-wrapper2,
+  +files/50-openoffice-bin, openoffice-bin-2.3.0_rc1.ebuild:
+  Get rid of the wrapper script
 
 *openoffice-bin-2.3.0_rc1 (04 Sep 2007)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index a4517ca48fc0..3a71528e4e9f 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -6,14 +6,10 @@ AUX 2.2.1/ooo-wrapper2 3791 RMD160 a89ef31ba665e6672e0d639b08e9d64fa0109b87 SHA1
 MD5 aec6b6270272783b523dbe9a62c68d19 files/2.2.1/ooo-wrapper2 3791
 RMD160 a89ef31ba665e6672e0d639b08e9d64fa0109b87 files/2.2.1/ooo-wrapper2 3791
 SHA256 5d200e7f2779d678dc27ff0ee39b84afdb8c07c00f0da2186594ba5bee950252 files/2.2.1/ooo-wrapper2 3791
-AUX 2.3.0_rc1/50-openoffice-bin 61 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 SHA1 01535195f88aee1cfaefc46fc5675693345267d2 SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde
-MD5 bfd1ef5874ad7c444562c1d2e58ee808 files/2.3.0_rc1/50-openoffice-bin 61
-RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 files/2.3.0_rc1/50-openoffice-bin 61
-SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde files/2.3.0_rc1/50-openoffice-bin 61
-AUX 2.3.0_rc1/ooo-wrapper2 3791 RMD160 a89ef31ba665e6672e0d639b08e9d64fa0109b87 SHA1 bfdcc08b7495e68f37ddd57317e7fee450d4e706 SHA256 5d200e7f2779d678dc27ff0ee39b84afdb8c07c00f0da2186594ba5bee950252
-MD5 aec6b6270272783b523dbe9a62c68d19 files/2.3.0_rc1/ooo-wrapper2 3791
-RMD160 a89ef31ba665e6672e0d639b08e9d64fa0109b87 files/2.3.0_rc1/ooo-wrapper2 3791
-SHA256 5d200e7f2779d678dc27ff0ee39b84afdb8c07c00f0da2186594ba5bee950252 files/2.3.0_rc1/ooo-wrapper2 3791
+AUX 50-openoffice-bin 61 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 SHA1 01535195f88aee1cfaefc46fc5675693345267d2 SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde
+MD5 bfd1ef5874ad7c444562c1d2e58ee808 files/50-openoffice-bin 61
+RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 files/50-openoffice-bin 61
+SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde files/50-openoffice-bin 61
 DIST OOo_2.2.1_LinuxIntel_install_en-US.tar.gz 131624994 RMD160 3a9f8ea0c510a10f2026d68d1247fbf04d12a304 SHA1 43c7a042c4f6e8eadfb63caed75d69548dd994c6 SHA256 0907bbeb4033a59e63ee1aa1e177243025e9af34b0edbee8430342e004723784
 DIST OOo_2.2.1rc3_20070529_LinuxIntel_langpack_af.tar.gz 13505647 RMD160 c5c330893dbf6c1face56d54598dc1afbcd6b6e1 SHA1 875b79e96bc091bb11456ce50e619dec4f9be463 SHA256 eae65f438b998835c04943b4d3e9c9deb63b11c9f5dad2eb4cb3b253ae20734d
 DIST OOo_2.2.1rc3_20070529_LinuxIntel_langpack_as-IN.tar.gz 13572531 RMD160 2b3c7cf776f555fa3ea2174675081f8f3e6ab75c SHA1 d38d142233ca0410cfc612726b81a8df27fd3291 SHA256 ce18e85fdd33785e869a4d4d0b15992b696b3e5ef0b2130119371b28e09ad542
@@ -160,14 +156,14 @@ EBUILD openoffice-bin-2.2.1.ebuild 5437 RMD160 eea707f49128cb98b27403052ed978412
 MD5 2a769fd38c4881978852e4ac1d074807 openoffice-bin-2.2.1.ebuild 5437
 RMD160 eea707f49128cb98b27403052ed9784127adce30 openoffice-bin-2.2.1.ebuild 5437
 SHA256 1b61e6e346db4b421060395c3fff74d7fedc1f809bd9ef677f29c25c8a30c3b9 openoffice-bin-2.2.1.ebuild 5437
-EBUILD openoffice-bin-2.3.0_rc1.ebuild 5443 RMD160 0dd129e227f3ca58adf9ef9f4aa7c6f82354695b SHA1 eebe0337ac1a83db667d32d789c5f84fa811e0c9 SHA256 d53d9749f9769a04de4c04138f3925b0f50e19e3130dd5bba74bbbeabcfc4bd9
-MD5 509355810ca5293fb37080c447b1fd25 openoffice-bin-2.3.0_rc1.ebuild 5443
-RMD160 0dd129e227f3ca58adf9ef9f4aa7c6f82354695b openoffice-bin-2.3.0_rc1.ebuild 5443
-SHA256 d53d9749f9769a04de4c04138f3925b0f50e19e3130dd5bba74bbbeabcfc4bd9 openoffice-bin-2.3.0_rc1.ebuild 5443
-MISC ChangeLog 31617 RMD160 03c3435b0c843bc8d14039595310c452f12986cd SHA1 79b5a1b4462f8686e4abeaa7b637805d925a44ae SHA256 b9ded0635dece82d7c804bcb95d9221cc1a00dba4bdc3cc809089b994741402a
-MD5 30ac191f6f47437358b5032f160f94a2 ChangeLog 31617
-RMD160 03c3435b0c843bc8d14039595310c452f12986cd ChangeLog 31617
-SHA256 b9ded0635dece82d7c804bcb95d9221cc1a00dba4bdc3cc809089b994741402a ChangeLog 31617
+EBUILD openoffice-bin-2.3.0_rc1.ebuild 5324 RMD160 2403cd8af3ff08b3d4b4162eb53b74f6e55f46d4 SHA1 b695b3e5619d38a26e545289b8697ee2c80fb035 SHA256 e3aac8643b5f4e56fd9c61dcfb38d2f00de3017845d3ec9d057124d9e9cfaa6f
+MD5 dd7235fa7b15ae57a973653f56878e57 openoffice-bin-2.3.0_rc1.ebuild 5324
+RMD160 2403cd8af3ff08b3d4b4162eb53b74f6e55f46d4 openoffice-bin-2.3.0_rc1.ebuild 5324
+SHA256 e3aac8643b5f4e56fd9c61dcfb38d2f00de3017845d3ec9d057124d9e9cfaa6f openoffice-bin-2.3.0_rc1.ebuild 5324
+MISC ChangeLog 31833 RMD160 81ceb5379b4625324159b68958d58aee2365138c SHA1 fc76829795a113f8fb1dc532eb8fed706070fcc9 SHA256 8ffb8e8897472675c2e533cf349532ebb2c8a4c2ea438b8a76a9517d8aef5702
+MD5 21b11875b2c12ce28153793bbb567d80 ChangeLog 31833
+RMD160 81ceb5379b4625324159b68958d58aee2365138c ChangeLog 31833
+SHA256 8ffb8e8897472675c2e533cf349532ebb2c8a4c2ea438b8a76a9517d8aef5702 ChangeLog 31833
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460
diff --git a/app-office/openoffice-bin/files/2.3.0_rc1/ooo-wrapper2 b/app-office/openoffice-bin/files/2.3.0_rc1/ooo-wrapper2
deleted file mode 100755
index 2e3893f5d788..000000000000
--- a/app-office/openoffice-bin/files/2.3.0_rc1/ooo-wrapper2
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/perl -w
-#*****************************************************************************
-# 
-#  ooffice - Wrapper script for OpenOffice.org
-# 
-#  Based on the Mandrake work.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
-# 
-#  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.
-# 
-#*****************************************************************************
-
-use strict;
-use IO::Handle;
-use Fcntl ':flock';
-
-my $Debug = $ENV{OOO_DEBUG};
-
-# Define the vendor of this particular OOo package
-my $VendorName = 'Gentoo';
-# Define system installation directory
-# Autoconf totally sucks for @libdir@ type substitution
-my $SystemInstallDir = 'INSTDIR';
-# Suffix for parallel installable versioning
-my $BinSuffix = '';
-# ooo-build version
-my $OOO_BUILDVERSION = 'PV';
-
-#=============================================================================
-# Main
-#=============================================================================
-
-# Parse command line arguments
-my @ooo_argv;
-my $session_quickstart;
-my $widgets_set;
-while ($ARGV[0]) {
-    $_ = shift;
-    if (m/^--session-quickstart/) {
-	$session_quickstart = 1;
-    } elsif (m/^--widgets-set/) {
-	$widgets_set = shift;
-	(defined $widgets_set) || die "Error: The option --widgets-set requires a value\n" .
-	                            "For example: --widgets-set gtk\n";
-    } elsif (m/^--version/) {
-	print "This is OpenOffice.org $OOO_BUILDVERSION\n";
-	exit 0;
-    } else {
-        push @ooo_argv, $_;
-    }
-}
-
-if (!@ooo_argv) {
-    my $arg;
-    if ($0 =~ m/\/oo(calc|draw|impress|math|web|writer|base)$BinSuffix$/) {
-        $arg = "-$1";
-    } elsif ($0 =~ m/\/oofromtemplate$BinSuffix$/) {
-        $arg = "slot:5500";
-    }
-
-    if ($arg) {
-        push @ooo_argv, "$arg";
-        $Debug && print "Append arg: $arg\n";
-    }
-} else {
-    $Debug && print "Ignoring type - since have filenames\n";
-}
-
-if (defined $widgets_set) {
-    $ENV{SAL_USE_VCLPLUGIN} = $widgets_set;
-}
-
-# overcome ghastly up-stream evilness
-$ENV{SAL_NOEXPANDFPICKER}='TRUE';
-
-if ($session_quickstart) {
-    $Debug && print "Execute quickstarter\n";
-    push @ooo_argv, '-quickstart';
-}
-
-# FIXME: the following two fixes should be done by OOo itself
-# create the user config directory  with safe rights 700 if it we find
-# the right path and the directory does not exist
-if (open BOOTSTRAPRC, "$SystemInstallDir/program/bootstraprc") {
-    while (my $line = <BOOTSTRAPRC>) {
-	chomp $line;
-    	if (($line =~ m/^\s*UserInstallation\s*=\s*([^\s]*)\s*$/) && ($1)) {
-	    my $userConfDir=$1;
-	    $userConfDir =~ s|\$SYSUSERCONFIG|$ENV{HOME}|;
-	    $userConfDir =~ s|file://||;
-	    mkdir ($userConfDir,0700) unless (-d $userConfDir);
-	    last;
-	}
-    }
-    close BOOTSTRAPRC;
-}
-# touch ~/.recently-used with safe rights 700 if it does not exist
-if (! -f "$ENV{HOME}/.recently-used") {
-    open (RECENTLY_USED, ">$ENV{HOME}/.recently-used") &&
-    close RECENTLY_USED &&
-    chmod 0600, "$ENV{HOME}/.recently-used";
-}
-	
-if (!(-f '/proc/version')) {
-    print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
-}
-
-# Clear PYTHONPATH, otherwise Python scripting does not work
-delete $ENV{'PYTHONPATH'};
-
-# And here we go.
-exec "$SystemInstallDir/program/soffice", @ooo_argv
diff --git a/app-office/openoffice-bin/files/2.3.0_rc1/50-openoffice-bin b/app-office/openoffice-bin/files/50-openoffice-bin
index 6b16e47f0187..6b16e47f0187 100644
--- a/app-office/openoffice-bin/files/2.3.0_rc1/50-openoffice-bin
+++ b/app-office/openoffice-bin/files/50-openoffice-bin
diff --git a/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild
index f370adaa5ff2..1011a76c6b7e 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild,v 1.1 2007/09/04 19:17:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0_rc1.ebuild,v 1.2 2007/09/04 21:09:27 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -108,17 +108,14 @@ src_install () {
 	insinto /usr/share/mime/packages
 	doins ${WORKDIR}/usr/share/mime/packages/openoffice.org.xml
 
-	# Install wrapper script
-	newbin ${FILESDIR}/${PV}/ooo-wrapper2 ooffice
-	sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice || die
-	sed -i -e "s|INSTDIR|${INSTDIR}|g" ${D}/usr/bin/ooffice || die
-
 	# Component symlinks
-	for app in base calc draw fromtemplate impress math web writer; do
-		dosym ooffice /usr/bin/oo${app}
+	for app in base calc draw impress math writer; do
+		dosym ${INSTDIR}/program/s${app} /usr/bin/oo${app}
 	done
 
 	dosym ${INSTDIR}/program/spadmin.bin /usr/bin/ooffice-printeradmin
+	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
+	dosym ${INSTDIR}/program/soffice.bin /usr/bin/ooffice
 
 	# Change user install dir
 	sed -i -e s/.openoffice.org2/.ooo-2.0/g ${D}${INSTDIR}/program/bootstraprc || die
@@ -130,7 +127,7 @@ src_install () {
 	rm -f ${D}${INSTDIR}/share/dict/ooo/*
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins ${FILESDIR}/${PV}/50-openoffice-bin
+	insinto /etc/revdep-rebuild && doins ${FILESDIR}/50-openoffice-bin
 
 }
 
@@ -149,8 +146,7 @@ pkg_postinst() {
 	elog
 	elog " Also, for individual components, you can use any of:"
 	elog
-	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
-	elog " ooweb or oowriter"
+	elog " oobase, oocalc, oodraw, ooimpress, oomath, or oowriter"
 	elog
 	elog " Spell checking is now provided through our own myspell-ebuilds, "
 	elog " if you want to use it, please install the correct myspell package "