- Fix bug 54179: Install mozillathunderbird-bin.desktop to

  /usr/share/applications instead of /usr/share/gnome/apps/Internet.
  This also necessitated some changes to the .desktop file which I
  based on balsa.desktop.  Additionally modified the .desktop file to
  explicitly mention (bin) in the Name entry so that both from-source
  and -bin versions can be installed simultaneously.
- Fix bug 54295: Move init file unpacking from pkg_postinst to
  src_install

4 files changed, 30 insertions, 14 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 70f2f26d9e81..9d84ab68a1c9 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/mozilla-thunderbird-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.4 2004/06/17 00:37:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.5 2004/06/18 14:58:27 agriffis Exp $
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  files/0.7/icon/mozillathunderbird-bin.desktop,
+  mozilla-thunderbird-bin-0.7.ebuild:
+  - Fix bug 54179: Install mozillathunderbird-bin.desktop to
+    /usr/share/applications instead of /usr/share/gnome/apps/Internet.
+    This also necessitated some changes to the .desktop file which I
+    based on balsa.desktop.  Additionally modified the .desktop file to
+    explicitly mention (bin) in the Name entry so that both from-source
+    and -bin versions can be installed simultaneously.
+  - Fix bug 54295: Move init file unpacking from pkg_postinst to
+    src_install
 
 *mozilla-thunderbird-bin-0.7 (16 Jun 2004)
 
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index a7be2f883ab7..3ebd45c4e39a 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,7 +1,7 @@
 MD5 78f5f39541e8d8459b0d16b89233619a mozilla-thunderbird-bin-0.6.ebuild 1886
 MD5 9c0f9fb55a5e11407144aea8ac12580e mozilla-thunderbird-bin-0.5.ebuild 2105
-MD5 31ca167dc8df1fc54c8f6fbf4a010d35 mozilla-thunderbird-bin-0.7.ebuild 2735
-MD5 4036b04a4eb940bf29e6f12cb9a4310e ChangeLog 2425
+MD5 e46622f9702b6bb599da9d9aa69a382b mozilla-thunderbird-bin-0.7.ebuild 2865
+MD5 e7340a723905f14be715a29784207937 ChangeLog 3044
 MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/MozillaThunderbird 294
 MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/thunderbird 294
@@ -16,5 +16,5 @@ MD5 4513b2f650df9b907c09257373a9f879 files/0.5/icon/thunderbird-icon.png 2537
 MD5 bb431eebb28f85d1c07957846fd3e4d2 files/0.5/icon/mozillathunderbird.desktop 148
 MD5 04115f0e204444eac76a092a63c89027 files/0.6/icon/thunderbird-icon.png 6499
 MD5 bb431eebb28f85d1c07957846fd3e4d2 files/0.6/icon/mozillathunderbird.desktop 148
-MD5 d53215cf1aac217ff533ef0fc06a5736 files/0.7/icon/mozillathunderbird-bin.desktop 156
+MD5 2a65eefd9de928054e33268c1d0081e3 files/0.7/icon/mozillathunderbird-bin.desktop 198
 MD5 04115f0e204444eac76a092a63c89027 files/0.7/icon/mozillathunderbird-bin-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird-bin/files/0.7/icon/mozillathunderbird-bin.desktop b/mail-client/mozilla-thunderbird-bin/files/0.7/icon/mozillathunderbird-bin.desktop
index d2a81b0be123..7fdb61334656 100644
--- a/mail-client/mozilla-thunderbird-bin/files/0.7/icon/mozillathunderbird-bin.desktop
+++ b/mail-client/mozilla-thunderbird-bin/files/0.7/icon/mozillathunderbird-bin.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Name=Mozilla Thunderbird
+Name=Mozilla Thunderbird (bin)
 Comment=Mail & News Reader
 Exec=/usr/bin/thunderbird-bin
 Icon=thunderbird-bin-icon.png
-Terminal=0
+Terminal=false
 Type=Application
+Categories=Application;Network;
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild
index 4d825ba347be..54b240ed947e 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild,v 1.2 2004/06/17 02:10:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.7.ebuild,v 1.3 2004/06/18 14:58:27 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -47,9 +47,18 @@ src_install() {
 	if use gnome; then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/${PV}/icon/mozillathunderbird-bin-icon.png
-		insinto /usr/share/gnome/apps/Internet
+		# 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}/${PV}/icon/mozillathunderbird-bin.desktop
 	fi
+
+	# 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-${PV}-init.tar.bz2 \
+		-C ${D}/opt/thunderbird
 }
 
 pkg_preinst() {
@@ -71,12 +80,6 @@ pkg_postinst() {
 	einfo "to simply thunderbird-bin"
 	einfo ""
 
-	# 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"
-	cd ${ROOT}/opt/thunderbird && tar xjpf ${FILESDIR}/thunderbird-bin-${PV}-init.tar.bz2
-
 	# This should be called in the postinst and postrm of all the
 	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
 	# thunderbird-bin ebuilds.