Use a stub script instead of symlink to mozilla-launcher. This in

combination with mozilla-launcher-1.28 should fix #78890
Package-Manager: portage-2.0.51.19

3 files changed, 22 insertions, 6 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index a4a04d7e219d..51f82fe63ace 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.45 2005/03/23 15:40:55 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.46 2005/03/23 15:58:06 agriffis Exp $
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  mozilla-thunderbird-1.0.2.ebuild:
+  Use a stub script instead of symlink to mozilla-launcher. This in
+  combination with mozilla-launcher-1.28 should fix #78890
 
 *mozilla-thunderbird-1.0.2 (23 Mar 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 7bb282f16f0d..4cd0a3f4d662 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,10 +1,10 @@
 MD5 6476a322906a3ba7edb984bd61bdd373 mozilla-thunderbird-0.8.ebuild 5012
 MD5 89028fb80f4bcad69d98c0feeae4f85b mozilla-thunderbird-0.7.3-r1.ebuild 4876
 MD5 26e94f691d2be6e1309f260e1f7ecf3b mozilla-thunderbird-0.9-r2.ebuild 5415
-MD5 36bdaf3e48484237c21dac3baaabe95e mozilla-thunderbird-1.0.2.ebuild 5657
+MD5 127276e24d3fd3a1fb757158cc940f18 mozilla-thunderbird-1.0.2.ebuild 5984
 MD5 78fae9ff5a579f572bfb7ace8cc24c50 mozilla-thunderbird-1.0.ebuild 5654
 MD5 e5171036acf1de25c3363d34ed56b19e mozilla-thunderbird-0.9.ebuild 5018
-MD5 4b5eaf5d3d0aa92fa004acf399332df1 ChangeLog 4438
+MD5 4479b0e0273f2918e04c0adeebe18056 ChangeLog 4656
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 f516c95f08febf6aff670f3b1ba416b9 mozilla-thunderbird-0.9-r3.ebuild 5651
 MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3-r1 207
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild
index d70a3b8891e4..a99d27521047 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.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/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild,v 1.1 2005/03/23 15:40:55 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild,v 1.2 2005/03/23 15:58:06 agriffis Exp $
 
 IUSE="crypt"
 
@@ -20,7 +20,8 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
-RDEPEND="crypt? ( >=app-crypt/gnupg-1.2.1 )"
+RDEPEND="crypt? ( >=app-crypt/gnupg-1.2.1 )
+	>=net-www/mozilla-launcher-1.28"
 
 S=${WORKDIR}/mozilla
 
@@ -113,7 +114,17 @@ src_install() {
 	# use mozilla-launcher which supports thunderbird as of version 1.6.
 	# version 1.7-r1 moved the script to /usr/libexec
 	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/thunderbird
+	cat <<EOF >${D}/usr/bin/thunderbird
+#!/bin/sh
+# 
+# Stub script to run mozilla-launcher.  We used to use a symlink here but
+# OOo brokenness makes it necessary to use a stub instead:
+# http://bugs.gentoo.org/show_bug.cgi?id=78890
+
+export MOZILLA_LAUNCHER=thunderbird
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+chmod 0755 ${D}/usr/bin/thunderbird
 
 	# Install icon and .desktop for menu entry
 	insinto /usr/share/pixmaps