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

4 files changed, 116 insertions, 7 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 38bbfb9b70a9..b989fe2a95ae 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.16 2004/12/25 07:44:49 chriswhite Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.17 2005/03/23 17:53:37 agriffis Exp $
+
+*mozilla-thunderbird-bin-1.0-r1 (23 Mar 2005)
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-thunderbird-bin-1.0-r1.ebuild:
+  Use a stub script instead of symlink to mozilla-launcher. This in
+  combination with mozilla-launcher-1.28 should fix #78890
 
 *mozilla-thunderbird-bin-1.0 (25 Dec 2004)
 
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index e7bf209b488a..bb7fa6f0975e 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,13 +1,15 @@
-MD5 0cbda7a579cc46195762f620d5e4a5e0 ChangeLog 4868
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 d481c25ca1c572385da29a401ea7522b mozilla-thunderbird-bin-0.9.ebuild 2791
 MD5 5fc3940f3308e1bb40b58f596064149b mozilla-thunderbird-bin-0.8.ebuild 2798
+MD5 88fe9eef009d3e92904335111fda02f8 mozilla-thunderbird-bin-1.0-r1.ebuild 3091
+MD5 7eede073acdbc33175372e869c087bed ChangeLog 5133
 MD5 c6deddccb745dd621684a16cd6a19489 mozilla-thunderbird-bin-1.0.ebuild 2799
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 fd75b9df64bbf98891a7dbe761f336de files/digest-mozilla-thunderbird-bin-0.8 89
 MD5 08ed4e4170ffaa94ba353a3dd1fffca9 files/digest-mozilla-thunderbird-bin-0.9 89
 MD5 7722c540e80c8edc4e8b7d3ac6ad7ce7 files/digest-mozilla-thunderbird-bin-1.0 69
-MD5 fd75b9df64bbf98891a7dbe761f336de files/digest-mozilla-thunderbird-bin-0.8 89
 MD5 552a6947de77bfa4e290acdb23a872a5 files/thunderbird-bin-0.7-init.tar.bz2 3339
-MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
+MD5 7722c540e80c8edc4e8b7d3ac6ad7ce7 files/digest-mozilla-thunderbird-bin-1.0-r1 69
 MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
-MD5 bb431eebb28f85d1c07957846fd3e4d2 files/icon/mozillathunderbird.desktop 148
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 bb431eebb28f85d1c07957846fd3e4d2 files/icon/mozillathunderbird.desktop 148
+MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0-r1 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0-r1
new file mode 100644
index 000000000000..357545f26ef0
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0-r1
@@ -0,0 +1 @@
+MD5 fc8d9d56e6fc24beb7fe5b8bc508c198 thunderbird-1.0.tar.gz 10355480
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0-r1.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0-r1.ebuild
new file mode 100644
index 000000000000..6137c90ed82e
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# 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-bin/mozilla-thunderbird-bin-1.0-r1.ebuild,v 1.1 2005/03/23 17:53:37 agriffis Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/thunderbird
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0/linux-i686-gtk2+xft/en-US/thunderbird-${PV}.tar.gz"
+
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="-* ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=x11-libs/gtk+-2.1.1
+	virtual/xft
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	>=net-www/mozilla-launcher-1.28"
+
+src_install() {
+	# Install thunderbird in /opt
+	dodir /opt
+	mv ${S} ${D}/opt/thunderbird
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/thunderbird
+
+	# Create stub to call mozilla-launcher
+	dodir /usr/bin
+	cat <<EOF >${D}/usr/bin/thunderbird-bin
+#!/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-bin
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+chmod 0755 ${D}/usr/bin/thunderbird-bin
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozillathunderbird-bin-icon.png
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird-bin.desktop
+
+	# Normally thunderbird-bin-0.7 must be run as root once before it
+	# can be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting firefox-bin-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-bin-0.7-init.tar.bz2 \
+		-C ${D}/opt/thunderbird
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/opt/MozillaThunderbird
+	rm -rf ${ROOT}/opt/thunderbird
+}
+
+pkg_postinst() {
+	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
+	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
+	einfo "on Install Extension to install Enigmail in your Thunderbird build."
+	einfo "Restart Thunderbird after having installed both extensions."
+	einfo ""
+	einfo "The extensions are located at http://enigmail.mozdev.org/"
+	einfo ""
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply thunderbird-bin"
+	einfo ""
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}