clean up wrapper

Package-Manager: portage-2.0.53_rc4

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 33c8056067cb22ec1f5918e2e4c2b7e40b11e48f..5d0019f10e726719fdf69a31f926e71d6d409e2d 100644 (file)
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.99 2005/10/08 20:50:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.100 2005/10/08 21:25:28 suka Exp $
+
+  08 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/ooo-wrapper2, openoffice-bin-2.0.0_rc2.ebuild:
+  clean up wrapper
 
   08 Oct 2005; Simon Stelling <blubb@gentoo.org>
   openoffice-bin-2.0.0_rc1.ebuild:

diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 0ee91988d9b68364de53b5a04b6e81e235e6a7e6..669659954a0684c66a45aa5d01b44b4985bbc7ed 100644 (file)
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,16 +1,16 @@
-MD5 4d260e593471a3202a01cfddf37d8626 ChangeLog 17681
-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 32bfa1358e928e738749074b69cf01f0 openoffice-bin-2.0.0_rc1.ebuild 6665
-MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718
-MD5 b1f2ad8373b8ac38a8d2256066dc7160 openoffice-bin-2.0.0_rc2.ebuild 7065
+MD5 2ae9f3f450cf11f6a2167dd43ee33202 ChangeLog 17815
+MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
+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 e03d40bf3ce0e7ed62819425202e5849 files/digest-openoffice-bin-2.0.0_rc1 4647
 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 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
-MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
-MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
-MD5 5dda7100c72b8c59a43001c9a39fba77 files/2.0.0/ooo-wrapper2 3950
+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
+MD5 7a2ad292ea79868dc4a29c86c5ddfc26 openoffice-bin-2.0.0_rc2.ebuild 7065

diff --git a/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2 b/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
index 8222add9ae931bf228ff78572f5d62c7d2f2007e..e67fd85a584336032fd2fc3bf7fbd0fd6b7afa7f 100755 (executable)
--- a/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
+++ b/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
@@ -25,27 +25,16 @@ use IO::Handle;
 use Fcntl ':flock';
 
 my $Debug = $ENV{OOO_DEBUG};
-my $DebugRH = $ENV{OOO_RH_DEBUG};
 
-# Define the vendor of this particular OOo pacakge
+# Define the vendor of this particular OOo package
 my $VendorName = 'Gentoo';
 # Define system installation directory
 # Autoconf totally sucks for @libdir@ type substitution
-my $SystemInstallDir = '/usr/lib/openoffice';
+my $SystemInstallDir = 'INSTDIR';
 # Suffix for parallel installable versioning
 my $BinSuffix = '2';
 # ooo-build version
 my $OOO_BUILDVERSION = 'PV';
-# Debugging
-
-if ( $DebugRH ) {
-       $Debug = 1;
-       $VendorName = "RedHat";
-}
-if ($Debug && $BinSuffix =~ /^\@/) {
-    $SystemInstallDir = "/usr/lib/ooo-1.9";
-    $BinSuffix = '1.9';
-}
 
 #=============================================================================
 # Main
@@ -64,7 +53,7 @@ while ($ARGV[0]) {
        (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 built with ooo-build-$OOO_BUILDVERSION\n";
+       print "This is OpenOffice.org $OOO_BUILDVERSION\n";
        exit 0;
     } else {
         push @ooo_argv, $_;
@@ -102,7 +91,7 @@ if ($session_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, "/usr/lib/openoffice/program/bootstraprc") {
+if (open BOOTSTRAPRC, "$SystemInstallDir/program/bootstraprc") {
     while (my $line = <BOOTSTRAPRC>) {
        chomp $line;
        if (($line =~ m/^\s*UserInstallation\s*=\s*([^\s]*)\s*$/) && ($1)) {

diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.0_rc2.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.0_rc2.ebuild
index 9a4ace9e54ca39279abbc1ac67549bdf1b397f2f..053bb0b0961cadb2a5b90239560ff3cb5d1c2045 100644 (file)
--- a/app-office/openoffice-bin/openoffice-bin-2.0.0_rc2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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-2.0.0_rc2.ebuild,v 1.3 2005/10/08 20:33:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0_rc2.ebuild,v 1.4 2005/10/08 21:25:28 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -147,7 +147,7 @@ src_install () {
        # Install wrapper script
        newbin ${FILESDIR}/${MY_PV3}/ooo-wrapper2 ooffice2
        sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice2 || die
-       sed -i -e "s:lib/:$(get_libdir)/:" ${D}/usr/bin/ooffice2 || die
+       sed -i -e "s|INSTDIR|${INSTDIR}|g" ${D}/usr/bin/ooffice2 || die
 
        # Component symlinks
        for app in base calc draw fromtemplate impress math web writer; do