Re-add old-style wrapper support, see bug #161811

Package-Manager: portage-2.1.2_rc4-r8

5 files changed, 445 insertions, 10 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index f49110c82c61..2b8471c467b7 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.292 2007/01/12 19:57:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.293 2007/01/12 22:54:26 suka Exp $
+
+  12 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.1.0/ooo-wrapper.in, +files/2.1.0/wrapper-readd.diff,
+  openoffice-2.1.0.ebuild:
+  Re-add old-style wrapper support, which has been removed in the most recent
+  ooo-build release. We need this for builds without gtk, which don't have
+  ooqstart and were broken as a result of that. See bug #161811
 
   12 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a6e5011217c9..acc36f51dde8 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -22,6 +22,14 @@ AUX 2.1.0/gentoo-2.1.0.diff 182 RMD160 2cf5750a040b0711f4cef05882a1d403d41927af
 MD5 0f5ab709306b362f1787d578510b0838 files/2.1.0/gentoo-2.1.0.diff 182
 RMD160 2cf5750a040b0711f4cef05882a1d403d41927af files/2.1.0/gentoo-2.1.0.diff 182
 SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee files/2.1.0/gentoo-2.1.0.diff 182
+AUX 2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 SHA1 77654213fbc2f1ef20e2a76b4bc87230865036c8 SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce
+MD5 3998f6afdb1e322b138d3d1c65449866 files/2.1.0/ooo-wrapper.in 2650
+RMD160 081f34f44be85f13224b59c7199fa27265563760 files/2.1.0/ooo-wrapper.in 2650
+SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce files/2.1.0/ooo-wrapper.in 2650
+AUX 2.1.0/wrapper-readd.diff 12211 RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 SHA1 0e5183e5f23653d7895f9255e12df3c173c7d59e SHA256 807f857d509b9c3817d46255bc243c56305eab4f36c581645787f4576cf4818b
+MD5 586494b3dae1789214b572a9c10ee8db files/2.1.0/wrapper-readd.diff 12211
+RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 files/2.1.0/wrapper-readd.diff 12211
+SHA256 807f857d509b9c3817d46255bc243c56305eab4f36c581645787f4576cf4818b files/2.1.0/wrapper-readd.diff 12211
 DIST OOO_2_0_4-binfilter.tar.bz2 16802527 RMD160 2574dd0cef9d6976b62e0a16d75b577d8002b139 SHA1 706032793396dcfbe462c8eff212d11a15b54a03 SHA256 45bf3993ddeab5a1bc724111f6066933cac9129493db24204ffe35840842af35
 DIST OOO_2_0_4-core.tar.bz2 121332967 RMD160 bc57ce5f6ff0a4ef714cbf7097b319d61d7ffc25 SHA1 19adc4be9306d3d05ed6da23f2d9c66bcededa51 SHA256 010dfa7b87a426ccea82a14c53877280a771448b9d935a49a636e82512e58cff
 DIST OOO_2_0_4-lang.tar.bz2 71585371 RMD160 acc3c0507011bad12a8c423e73bf5ea4750500e1 SHA1 aa517e80b6bdf3c80d738b6dd18aee85588f19ab SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f
@@ -42,14 +50,14 @@ EBUILD openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5
 MD5 7387216086e33c7907d1450fe64bb965 openoffice-2.0.4.ebuild 9998
 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c openoffice-2.0.4.ebuild 9998
 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10 openoffice-2.0.4.ebuild 9998
-EBUILD openoffice-2.1.0.ebuild 11025 RMD160 d691354d151035c7207dd0e963d8459c013e11b2 SHA1 a9e95be7b07686c113ac14766390884e40e88f69 SHA256 09c93549300ff5d6702d6cc7c0b4cfc2f72960b00b2a1b0dcc138930a7c70aea
-MD5 0cb2e31a4b6532a35a3432155ab0ecf9 openoffice-2.1.0.ebuild 11025
-RMD160 d691354d151035c7207dd0e963d8459c013e11b2 openoffice-2.1.0.ebuild 11025
-SHA256 09c93549300ff5d6702d6cc7c0b4cfc2f72960b00b2a1b0dcc138930a7c70aea openoffice-2.1.0.ebuild 11025
-MISC ChangeLog 60903 RMD160 bb10ae4838fd1f5e80c2b087292ea1071e3e031b SHA1 ff538644ee0474a287522af99b97418ad98b5bbc SHA256 76a5ad510db39337fbcebb73431b94b5ac2c67cf6c23ec0cc4123261415131d7
-MD5 430cb86b8bf9a7d18bb93fcededf0c73 ChangeLog 60903
-RMD160 bb10ae4838fd1f5e80c2b087292ea1071e3e031b ChangeLog 60903
-SHA256 76a5ad510db39337fbcebb73431b94b5ac2c67cf6c23ec0cc4123261415131d7 ChangeLog 60903
+EBUILD openoffice-2.1.0.ebuild 11160 RMD160 112743fac96cb92f26806e271869931e7711cd9a SHA1 735e936d3218bcfd854ee1e2eba71d2c8902d28c SHA256 ce3b1a511f476ca7bfb21c721c42f674e30784178c832b7f004b86c1ed2f8653
+MD5 84d1c332efd845a4814745eb3fcbe7fd openoffice-2.1.0.ebuild 11160
+RMD160 112743fac96cb92f26806e271869931e7711cd9a openoffice-2.1.0.ebuild 11160
+SHA256 ce3b1a511f476ca7bfb21c721c42f674e30784178c832b7f004b86c1ed2f8653 openoffice-2.1.0.ebuild 11160
+MISC ChangeLog 61265 RMD160 46f61993ec58337a35884e0592d31ca0c539b842 SHA1 fc30a6211dde185463c97e7c1a62dd0864bfbeed SHA256 4cf8e88ea442b1338247b47272cffa202b008844f4035e00bc0c3605f35643f1
+MD5 00c3a109f363bac19e2a192fc1f1045b ChangeLog 61265
+RMD160 46f61993ec58337a35884e0592d31ca0c539b842 ChangeLog 61265
+SHA256 4cf8e88ea442b1338247b47272cffa202b008844f4035e00bc0c3605f35643f1 ChangeLog 61265
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.1.0/ooo-wrapper.in b/app-office/openoffice/files/2.1.0/ooo-wrapper.in
new file mode 100755
index 000000000000..4a4475aaa996
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/ooo-wrapper.in
@@ -0,0 +1,93 @@
+#!/usr/bin/perl -w
+#
+# ooffice - Wrapper script for OpenOffice.org
+#
+
+# Define system installation directory
+my $SystemInstallDir = '@OOINSTBASE@';
+# Suffix for parallel installable versioning
+my $BinSuffix = '@BINSUFFIX@';
+# ooo-build version
+my $OOO_BUILDVERSION = '@OOO_BUILDVERSION@';
+
+if ($SystemInstallDir =~ /^@/) {
+    $SystemInstallDir = '/usr/lib/ooo-2.0';
+    $BinSuffix = '';
+}
+
+my $Binary = 'soffice';
+if (-x "$SystemInstallDir/program/ooqstart") {
+    $Binary = 'ooqstart';
+    $ENV{OOO_EXTRA_ARG} ||= '';
+}
+
+my @ooo_argv;
+my $widgets_set;
+while ($ARGV[0]) {
+    $_ = shift;
+    if (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 built with ooo-build-$OOO_BUILDVERSION\n";
+	exit 0;
+    } elsif (m/^-(base|calc|draw|impress|math|web|writer)$/ && $Binary eq "ooqstart") {
+        $ENV{OOO_EXTRA_ARG} = $_;
+    } elsif (m/^-fromtemplate$/ && $Binary eq "ooqstart") {
+        $ENV{OOO_EXTRA_ARG} = "slot:5500";
+    } 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) {
+        if ($Binary eq "soffice") {
+            push @ooo_argv, "$arg";
+	} else {
+	    $ENV{OOO_EXTRA_ARG} = $arg;
+	}
+    }
+}
+
+if (defined $widgets_set) {
+    $ENV{SAL_USE_VCLPLUGIN} = $widgets_set;
+}
+
+# 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";
+}
+
+# And here we go.
+exec "$SystemInstallDir/program/$Binary", @ooo_argv
diff --git a/app-office/openoffice/files/2.1.0/wrapper-readd.diff b/app-office/openoffice/files/2.1.0/wrapper-readd.diff
new file mode 100644
index 000000000000..531aa1a9defc
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/wrapper-readd.diff
@@ -0,0 +1,324 @@
+--- bin/setup.in
++++ bin/setup.in
+@@ -28,6 +28,7 @@
+ ENABLE_ODK='@ENABLE_ODK@'
+ USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'
+ ENABLE_MONO='@ENABLE_MONO@'
++ENABLE_QUICKSTART='@ENABLE_QUICKSTART@'
+ ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
+ GRAPHITE_SRC='@GRAPHITE_SRC@'
+ PROPAGATED_ARGS="@PROPAGATED_ARGS@"
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -15,6 +15,14 @@
+ rm -Rf $OOINSTDIR;
+ set -e
+ 
++echo "Building $OOINSTDIR/ooo-wrapper$BINSUFFIX";
++sed -e "s|@OOINSTBASE@|$OOINSTBASE|g
++	s|@SYSCONFDIR@|$SYSCONFDIR|g
++	s|@BINSUFFIX@|$BINSUFFIX|g
++	s|@OOO_BUILDVERSION@|$OOO_BUILDVERSION|g
++	s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g
++	s|@VENDORNAME@|$VENDORNAME|g" $TOOLSDIR/bin/ooo-wrapper.in \
++		>| "$OOBUILDDIR/ooo-wrapper$BINSUFFIX" || exit 1;
+ mkdir -p $PREFIX/bin
+ 
+ sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/ootool.in \
+@@ -28,6 +36,20 @@
+ 
+ sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/oosmoketest.in \
+ 		>| "$OOBUILDDIR/oosmoketest$BINSUFFIX" || exit 1;
++
++create_simple_wrapper()
++{
++    cat <<EOT >$2
++#!/bin/sh
++
++# Keep in ~sync with ooo-wrapper
++
++SystemInstallDir="$OOINSTBASE"
++
++exec "$1" "\$@"
++EOT
++    chmod 755 $2
++}
+ 
+ create_qstart_wrapper()
+ {
+@@ -45,44 +67,60 @@
+     chmod +x $2
+ }
+ 
+-# directory for man
+-mkdir -p $MANDIR/man1
+-
+-# startup wrappers
+-for app in calc draw impress math web writer base; do
+-    create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" "" || exit 1;
+-done
+-create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "" "slot:5500" || exit 1;
+-create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" "" || exit 1;
+-if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
+-    -o "z$VENDORNAME" = "zDebian"; then
+-    for app in calc draw impress math web writer base fromtemplate ffice ; do
+-        echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
+-    done
+-fi
+-
+-# /usr/bin/ooffice symlink is necessary by java UNO components to find
+-# the UNO installation using $PATH, see
+-# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
+-# Note: if you want to support parallel installation of more OOo versions
+-#       you cannot include this link directly into the package
+-#       For example, the Novell package mark this symlink as %ghost
+-#	and update it in %post and %postun
+-ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
+-
+-# no man-page so ...
+-if test "z$VENDORNAME" != "zDebian"; then
+-    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
+-    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+-fi
+-
+-# create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-gen_bash_comp_opts=--binsuffix="$BINSUFFIX"
+-if test "z$ENABLE_OPENXML" = "zyes" ; then
+-    gen_bash_comp_opts="$gen_bash_comp_opts --enable-openxml"
+-fi
+-$TOOLSDIR/bin/generate-bash-completion $gen_bash_comp_opts $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
++# Skip the versioning and linking dance of the wrapper script for Red Hat
++if test "z$VENDORNAME" = "zRedHat"; then
++	install_script $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin/ooffice
++	for app in calc draw impress html math writer; do
++		ln -sf /usr/bin/ooffice $PREFIX/bin/oo${app}
++	done
++else
++	mkdir -p $MANDIR/man1
++	if test "z$ENABLE_QUICKSTART" = "z"; then
++	    install_script $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin/ooo-wrapper$BINSUFFIX
++	    for app in base calc draw fromtemplate impress math web writer ffice; do
++		ln -sf ooo-wrapper${BINSUFFIX} $PREFIX/bin/oo${app}${BINSUFFIX}
++		if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
++		    -o "z$VENDORNAME" = "zDebian"; then
++		    echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
++		fi
++	    done
++	else
++	    for app in calc draw impress math web writer base; do
++		create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" "" || exit 1;
++	    done
++	    create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "" "slot:5500" || exit 1;
++	    create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" "" || exit 1;
++	    if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
++		-o "z$VENDORNAME" = "zDebian"; then
++		for app in calc draw impress math web writer base fromtemplate ffice ; do
++		    echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
++		done
++	    fi
++	fi
++
++	# /usr/bin/ooffice symlink is necessary by java UNO components to find
++	# the UNO installation using $PATH, see
++	# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
++	# Note: if you want to support parallel installation of more OOo versions
++	#       you cannot include this link directly into the package
++	#       For example, the Novell package mark this symlink as %ghost
++	#	and update it in %post and %postun
++	ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
++
++	# no man-page so ...
++	if test "z$VENDORNAME" != "zDebian"; then
++	    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
++	    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
++	fi
++
++	# create bash completion
++	mkdir -p $OODESTDIR/etc/bash_completion.d
++	if test "z$ENABLE_QUICKSTART" = "z"; then
++	    $TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooo-wrapper$BINSUFFIX.sh
++	else
++	    $TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
++	fi
++fi
+ 
+ if test "z$VENDORNAME" != "zRedHat"; then
+ 	mkdir -p $MANDIR/man1
+@@ -622,8 +664,14 @@
+ 		directory=$1
+ 		shift
+ 		mkdir -m755 -p "$directory"/usr/bin
++		if test "$ENABLE_QUICKSTART" = ""; then
++			mkdir -m755 -p "$directory"/usr/share/man/man1
++		fi
+ 		while test -n "$1"; do
+ 			mv usr/*bin/"$1$BINSUFFIX" "$directory"/usr/bin
++			if test "$ENABLE_QUICKSTART" = ""; then
++				mv usr/share/man/man1/"$1$BINSUFFIX.1" "$directory"/usr/share/man/man1
++			fi
+ 			shift
+ 		done
+ 	}
+@@ -634,6 +682,11 @@
+ 	move_wrappers pkg/openoffice.org-impress ooimpress
+ 	move_wrappers pkg/openoffice.org-math oomath
+ 	move_wrappers pkg/openoffice.org-draw oodraw
++	if test "$ENABLE_QUICKSTART" = ""; then
++		for F in bin/ooo-wrapper; do
++			mv usr/$F$BINSUFFIX pkg/openoffice.org-common/usr/bin
++		done
++	fi
+ 
+ 	# Core package contains arch dependent files
+ 	#mkdir -m755 -p pkg/openoffice.org-core/$OOINSTBASE/program/filter
+@@ -662,8 +715,13 @@
+ 	mv usr/share/man/man1/openoffice$BINSUFFIX.1 \
+ 		pkg/openoffice.org-common/usr/share/man/man1
+ 	mkdir -p pkg/openoffice.org-common/etc/bash_completion.d
+-	mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
+-		pkg/openoffice.org-common/etc/bash_completion.d
++	if test "$ENABLE_QUICKSTART" = ""; then
++		mv etc/bash_completion.d/ooo-wrapper$BINSUFFIX.sh \
++			pkg/openoffice.org-common/etc/bash_completion.d
++	else
++		mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
++			pkg/openoffice.org-common/etc/bash_completion.d
++	fi
+ 	mv .$OOINSTBASE/program/java-set-classpath \
+ 		pkg/openoffice.org-common/$OOINSTBASE/program
+ 	if [ -e .$OOINSTBASE/program/kdebe1.uno.so ]; then \
+--- configure.in 
++++ configure.in 
+@@ -204,6 +204,11 @@
+ AC_ARG_ENABLE(gtk,
+ [
+   --disable-gtk           Disables gtk+ native widgets.],
++,)
++
++AC_ARG_ENABLE(quickstart,
++[
++  --disable-quickstart    Disables tiny stub factory/splash X11+glib app build.]
+ ,)
+ 
+ AC_ARG_ENABLE(kde,
+@@ -587,6 +592,30 @@
+ 
+ AC_MSG_RESULT($OOO_WIDGET_FLAGS)
+ AC_SUBST(OOO_WIDGET_FLAGS)
++
++AC_MSG_CHECKING([for quick-start])
++ENABLE_QUICKSTART=
++if test "$enable_quickstart" != "no"; then
++   ENABLE_QUICKSTART=TRUE
++   AC_MSG_RESULT([enabled])
++else
++   AC_MSG_RESULT([disabled])
++fi
++AC_SUBST(ENABLE_QUICKSTART)
++
++PKG_CHECK_MODULES( libstartup_notification, [ libstartup-notification-1.0 ],
++		   have_startup_notification=true, have_startup_notification=false )
++
++AC_MSG_CHECKING([for startup notification in dekstop files])
++if test "$have_startup_notification" = "true" -a \
++        "$ENABLE_QUICKSTART" != "TRUE" ; then
++	STARTUPNOTIFY='true'
++	AC_MSG_RESULT([enabled])
++else
++	STARTUPNOTIFY='false'
++	AC_MSG_RESULT([disabled])
++fi
++AC_SUBST(STARTUPNOTIFY)
+ 
+ if test "z$BUILD_WIN32" = "zyes" -a "z$enable_cairo" = "z" ; then
+     AC_MSG_WARN([On Cygwin, automatically using --disable-cairo])
+--- desktop/base.desktop.in.in 
++++ desktop/base.desktop.in.in 
+@@ -8,7 +8,7 @@
+ Icon=ooo-base@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=Office;Database
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
+ _Name=OpenOffice.org Base
+ _GenericName=Database
+--- desktop/calc.desktop.in.in 
++++ desktop/calc.desktop.in.in 
+@@ -8,7 +8,7 @@
+ Type=Application
+ InitialPreference=6
+ Categories=Office;Spreadsheet
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls
+ _Name=OpenOffice.org Calc
+ _GenericName=Spreadsheet
+--- desktop/draw.desktop.in.in 
++++ desktop/draw.desktop.in.in 
+@@ -7,7 +7,7 @@
+ Icon=ooo-draw@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=Graphics;VectorGraphics
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ InitialPreference=6
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
+ _Name=OpenOffice.org Draw
+--- desktop/impress.desktop.in.in 
++++ desktop/impress.desktop.in.in 
+@@ -7,7 +7,7 @@
+ Icon=ooo-impress@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=Office;Presentation
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
+ InitialPreference=5
+ _Name=OpenOffice.org Impress
+--- desktop/math.desktop.in.in 
++++ desktop/math.desktop.in.in 
+@@ -7,7 +7,7 @@
+ Exec=oomath@OOO_BINSUFFIX@ %U
+ Icon=ooo-math@OOO_BINSUFFIX@.png
+ Type=Application
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
+ _Name=OpenOffice.org Math
+ _GenericName=Formula
+--- desktop/template.desktop.in.in 
++++ desktop/template.desktop.in.in 
+@@ -8,7 +8,7 @@
+ Icon=ooo-template@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=X-SuSE-Core-Office;Office;
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ _Name=OpenOffice.org
+ _GenericName=Office Suite
+ 
+--- desktop/web.desktop.in.in 
++++ desktop/web.desktop.in.in 
+@@ -7,7 +7,7 @@
+ Icon=ooo-web@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=Network;WebDevelopment
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.text-web
+ _Name=OpenOffice.org Writer/Web
+ _GenericName=Web Page Creation
+--- desktop/writer.desktop.in.in 
++++ desktop/writer.desktop.in.in 
+@@ -7,7 +7,7 @@
+ Icon=ooo-writer@OOO_BINSUFFIX@.png
+ Type=Application
+ Categories=Office;WordProcessor
+-StartupNotify=false
++StartupNotify=@STARTUPNOTIFY@
+ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf@ADD_OPENXML_WORD_MIME@
+ InitialPreference=5
+ _Name=OpenOffice.org Writer
+
diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild
index 5a4530d212de..a046c7e05cbb 100644
--- a/app-office/openoffice/openoffice-2.1.0.ebuild
+++ b/app-office/openoffice/openoffice-2.1.0.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/openoffice-2.1.0.ebuild,v 1.5 2007/01/12 19:57:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.6 2007/01/12 22:54:26 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -194,7 +194,9 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+	epatch ${FILESDIR}/${PV}/wrapper-readd.diff
 	use !java && epatch ${FILESDIR}/${PV}/disable_cxxhelplinker.diff
+	cp -f ${FILESDIR}/${PV}/ooo-wrapper.in ${S}/bin || die
 
 	#Use flag checks
 	if use java ; then
@@ -286,6 +288,7 @@ src_compile() {
 		`use_enable kde` \
 		`use_enable cairo` \
 		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
 		`use_enable pam` \
 		`use_enable !debug strip` \
 		`use_enable odk` \