- Fix bug 54179: Install mozillathunderbird.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
- Fix bug 54295: Move init file unpacking from pkg_postinst to
  src_install
- Get rid of the stupid perl dependency; it was only being used to
  edit the .desktop file, and sed would have sufficed in any case

4 files changed, 29 insertions, 15 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 19fc20f9d700..400f6c833048 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/mozilla-thunderbird
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.9 2004/06/17 23:25:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.10 2004/06/18 14:52:08 agriffis Exp $
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  files/icon/mozillathunderbird.desktop, mozilla-thunderbird-0.7.ebuild:
+  - Fix bug 54179: Install mozillathunderbird.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
+  - Fix bug 54295: Move init file unpacking from pkg_postinst to
+    src_install
+  - Get rid of the stupid perl dependency; it was only being used to
+    edit the .desktop file, and sed would have sufficed in any case
 
 *mozilla-thunderbird-0.6-r2 (17 Jun 2004)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 9f3dc4d2f31d..ed02703fb860 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,10 +1,10 @@
 MD5 d4e071db4b4e0650576aba13b96a6dd4 mozilla-thunderbird-0.6-r2.ebuild 8565
 MD5 72cdf4b68ad1d964be5ba1a52b3a34f2 mozilla-thunderbird-0.5.ebuild 6288
-MD5 bb1352170de426509f1f49463e1122fc mozilla-thunderbird-0.7.ebuild 9252
+MD5 fe2f7673efb6f56cca9f001391e6ea11 mozilla-thunderbird-0.7.ebuild 9381
 MD5 8df9c881865e6daae60a81ebf5c86515 mozilla-thunderbird-0.6-r1.ebuild 8171
 MD5 fe7e73947f7cb03aced08404acd6cac9 mozilla-thunderbird-0.6.ebuild 7894
 MD5 384de207a85049304ceb08370d1a05fb mozilla-thunderbird-0.5-r1.ebuild 6453
-MD5 7f25c7cb7cb0b51abc0272d7a2884d00 ChangeLog 7804
+MD5 12ef39479add86f5ecc20dfe00f54831 ChangeLog 8371
 MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
 MD5 f981a963a4840e1880440f1f77ea54b2 files/digest-mozilla-thunderbird-0.5-r1 205
@@ -18,6 +18,6 @@ MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6 205
 MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
-MD5 bb431eebb28f85d1c07957846fd3e4d2 files/icon/mozillathunderbird.desktop 148
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop b/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop
index f9cc517d96dd..8e91b69de6f2 100644
--- a/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop
+++ b/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop
@@ -3,5 +3,6 @@ Name=Mozilla Thunderbird
 Comment=Mail & News Reader
 Exec=/usr/bin/thunderbird
 Icon=thunderbird-icon.png
-Terminal=0
+Terminal=false
 Type=Application
+Categories=Application;Network;
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild
index bc1e03615dbc..a2a1c8df1c74 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-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/mozilla-thunderbird-0.7.ebuild,v 1.2 2004/06/17 23:25:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild,v 1.3 2004/06/18 14:52:08 agriffis Exp $
 
 IUSE="gnome gtk2 ipv6 ldap crypt xinerama"
 
@@ -44,8 +44,7 @@ RDEPEND="virtual/x11
 	>=net-www/mozilla-launcher-1.7-r1"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-lang/perl"
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/mozilla
 
@@ -279,9 +278,18 @@ src_install() {
 	if use gnome; then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/icon/thunderbird-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}/icon/mozillathunderbird.desktop
 	fi
+
+	# Normally thunderbird-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 thunderbird-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-${PV}-init.tar.bz2 \
+		-C ${D}/usr/lib/MozillaThunderbird
 }
 
 pkg_preinst() {
@@ -293,12 +301,6 @@ pkg_preinst() {
 pkg_postinst() {
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
 
-	# Normally thunderbird-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 thunderbird-${PV} initialization files"
-	cd ${MOZILLA_FIVE_HOME} && tar xjpf ${FILESDIR}/thunderbird-${PV}-init.tar.bz2
-
 	# Fix permissions on misc files
 	find ${MOZILLA_FIVE_HOME}/ -perm 0700 -exec chmod 0755 {} \; || :