Install /usr/bin/thunderbird-bin stub using install_mozilla_launcher_stub

from mozilla-launcher.eclass #99084
Package-Manager: portage-2.0.51.20-r5

6 files changed, 17 insertions, 137 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index c8f1edccd75b..9fcca8d62fce 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.23 2005/07/15 01:38:06 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.24 2005/07/18 15:07:34 agriffis Exp $
+
+*mozilla-thunderbird-bin-1.0.5-r1 (18 Jul 2005)
+
+  18 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-bin-1.0.2.ebuild,
+  -mozilla-thunderbird-bin-1.0.5.ebuild,
+  +mozilla-thunderbird-bin-1.0.5-r1.ebuild:
+  Install /usr/bin/thunderbird-bin stub using install_mozilla_launcher_stub
+  from mozilla-launcher.eclass #99084
 
   15 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
   mozilla-thunderbird-bin-1.0.5.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index b603a6b28783..a0dcac83f32c 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 18746450ed2b6c037ca8d1d4d7617db8 mozilla-thunderbird-bin-1.0.5.ebuild 3311
-MD5 a1b93d8bdfb97f8e82cec5680c0d7adf mozilla-thunderbird-bin-1.0.2.ebuild 3312
-MD5 49cb88dd08e5b779f4773a4085a96fd5 ChangeLog 6352
+MD5 bc5c172ec57bb04b0e23faad148677bc mozilla-thunderbird-bin-1.0.5-r1.ebuild 2998
+MD5 4e2a1739a969ffec1fb0db7f781b408f ChangeLog 6692
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 cac57af7f63e97aed3c1be35a58f7ea9 files/digest-mozilla-thunderbird-bin-1.0.5-r1 71
 MD5 552a6947de77bfa4e290acdb23a872a5 files/thunderbird-bin-0.7-init.tar.bz2 3339
-MD5 b45ad1c0970314d565c8674885fdedbb files/digest-mozilla-thunderbird-bin-1.0.2 71
-MD5 cac57af7f63e97aed3c1be35a58f7ea9 files/digest-mozilla-thunderbird-bin-1.0.5 71
 MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
 MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1xOX8zY1VwezZiERAm6SAJ9H0lz8TkM5Do24uJgeCiRRlmy09ACfaTVr
-Uo0kb7bD0ibPxlb+dqiWj/I=
-=vzFR
------END PGP SIGNATURE-----
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.2 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.2
deleted file mode 100644
index c2d95804ae98..000000000000
--- a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b309b1deeab80a96652812e3a2177e1c thunderbird-1.0.2.tar.gz 10366456
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5-r1
index cc2edf4e9dbe..cc2edf4e9dbe 100644
--- a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5-r1
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.2.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.2.ebuild
deleted file mode 100644
index 437440886a3e..000000000000
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.2.ebuild,v 1.2 2005/07/10 18:45:56 humpback 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/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz"
-
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
-RESTRICT="nostrip"
-
-KEYWORDS="-* x86 ~amd64"
-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
-	>=www-client/mozilla-launcher-1.28
-	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.1.1
-			 >=app-emulation/emul-linux-x86-gtklibs-2.1 )"
-
-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 ""
-
-	if use amd64; then
-		einfo "You just installed a thunderbird version pre-built for 32 bits"
-		einfo "system."
-	fi
-	# 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
-}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5-r1.ebuild
index 40530bfc91cc..03bba9d27077 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5-r1.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-bin/mozilla-thunderbird-bin-1.0.5.ebuild,v 1.2 2005/07/15 01:38:06 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5-r1.ebuild,v 1.1 2005/07/18 15:07:34 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -29,7 +29,7 @@ RDEPEND="virtual/x11
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	>=www-client/mozilla-launcher-1.28
+	>=www-client/mozilla-launcher-1.35
 	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.1.1
 			 >=app-emulation/emul-linux-x86-gtklibs-2.1 )"
 
@@ -41,19 +41,8 @@ src_install() {
 	# 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 /usr/bin/thunderbird-bin
+	install_mozilla_launcher_stub thunderbird-bin /opt/thunderbird
 
 	# Install icon and .desktop for menu entry
 	insinto /usr/share/pixmaps