- Fix bug 54179: Install mozillafirefox.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 epiphany.desktop
- Fix bug 54295: Move init file unpacking from pkg_postinst to
  src_install

4 files changed, 26 insertions, 14 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 6f91add53d20..2c6590453bf4 100644
--- a/net-www/mozilla-firefox-bin/ChangeLog
+++ b/net-www/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/mozilla-firefox-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.12 2004/06/16 22:32:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.13 2004/06/18 14:43:09 agriffis Exp $
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  files/icon/mozillafirefox-bin.desktop, mozilla-firefox-bin-0.9-r1.ebuild:
+  - Fix bug 54179: Install mozillafirefox.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 epiphany.desktop
+  - Fix bug 54295: Move init file unpacking from pkg_postinst to
+    src_install
 
   16 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   mozilla-firefox-bin-0.9-r1.ebuild:
diff --git a/net-www/mozilla-firefox-bin/Manifest b/net-www/mozilla-firefox-bin/Manifest
index 4b598e1f4912..8b20cb5ce12e 100644
--- a/net-www/mozilla-firefox-bin/Manifest
+++ b/net-www/mozilla-firefox-bin/Manifest
@@ -1,8 +1,8 @@
 MD5 48810ff21ecd967aa9d860241c6a24f6 mozilla-firefox-bin-0.8-r1.ebuild 1856
 MD5 a0f0ff3f69f5a868e92ab836a73e9401 mozilla-firefox-bin-0.8.ebuild 1770
-MD5 ae5a877dce816f18e82f25b1888b20e6 ChangeLog 2785
+MD5 5dc9f0d7d7859b4e426b80d06df16f9c ChangeLog 3216
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 2b85ea27f885ddf168545a17f2bea8f3 mozilla-firefox-bin-0.9-r1.ebuild 2416
+MD5 66b0cfbb7e117e796d2fc8b3d4aff06c mozilla-firefox-bin-0.9-r1.ebuild 2541
 MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
 MD5 f44a87c587e1fef5c80da4f7ad796bb6 files/firefox 580
 MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
@@ -10,6 +10,6 @@ MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8-r1 84
 MD5 8e71183312ac3031eca6d2327bc2a09c files/digest-mozilla-firefox-bin-0.9-r1 84
 MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8 84
 MD5 1336c4a7b24e96ae255fdf2330fac6fc files/icon/mozillafirefox.desktop 129
-MD5 27cc47b838edda1eea220f75a0c23359 files/icon/mozillafirefox-bin.desktop 150
+MD5 b484fa1bed2e56b7675a74d70e64fd51 files/icon/mozillafirefox-bin.desktop 189
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
diff --git a/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop
index ccbd12f58fbf..0cef5bbcf349 100644
--- a/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop
+++ b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Name=Mozilla Firefox (bin)
 Comment=Web Browser
-Exec=/usr/bin/firefox-bin
+Exec=/usr/bin/firefox-bin %U
 Icon=mozillafirefox-bin-icon.png
-Terminal=0
+Terminal=false
 Type=Application
+Categories=Application;Network;
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild
index 2fcfbe100ec9..269ee070057a 100644
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.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/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild,v 1.2 2004/06/16 22:32:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild,v 1.3 2004/06/18 14:43:09 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -53,9 +53,17 @@ src_install() {
 	if use gnome; then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/icon/mozillafirefox-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}/icon/mozillafirefox-bin.desktop
 	fi
+
+	# Normally firefox-bin-0.9 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}/firefox-bin-${PV}-init.tar.bz2 -C ${D}/opt/firefox
 }
 
 pkg_preinst() {
@@ -72,12 +80,6 @@ pkg_preinst() {
 pkg_postinst() {
 	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
 
-	# Normally firefox-bin-0.9 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 ${MOZILLA_FIVE_HOME} && tar xjpf ${FILESDIR}/firefox-bin-${PV}-init.tar.bz2
-
 	update_mozilla_launcher_symlinks
 }