Mozilla Branding fixes committed on behalf of Anarchy. Fixes bug #153291

(Portage version: 2.1.2_pre3-r8)

4 files changed, 25 insertions, 5 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 38dc64410278..3369b96f275c 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.205 2006/10/25 22:55:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.206 2006/10/31 15:46:21 cardoe Exp $
+
+  31 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/icon/mozillafirefox-1.5-unbranded.desktop,
+  +files/icon/firefox-icon-unbranded.png, mozilla-firefox-2.0.ebuild:
+  Mozilla Branding fixes committed on behalf of Anarchy. Fixes bug #153291
 
   25 Oct 2006; Zac Medico <zmedico@gentoo.org> mozilla-firefox-2.0.ebuild:
   Fix "cp: Argument list too long" error for bug #150687. Thanks to Anarchy
diff --git a/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png b/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png
new file mode 100644
index 000000000000..22aac8114adc
--- /dev/null
+++ b/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png
diff --git a/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5-unbranded.desktop b/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5-unbranded.desktop
new file mode 100644
index 000000000000..c6d351b5cc6c
--- /dev/null
+++ b/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5-unbranded.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Bon Echo
+Comment=Web Browser
+Exec=/usr/bin/firefox %U
+Icon=firefox-icon-unbranded.png
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml
+Categories=Application;Network;
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
index cd03491062ab..8f4b15fc0b25 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild,v 1.5 2006/10/25 22:55:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild,v 1.6 2006/10/31 15:46:21 cardoe Exp $
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
@@ -221,9 +221,15 @@ src_install() {
 	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
 
 	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/firefox-icon.png
-	newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
-		mozillafirefox-2.0.desktop
+	if use mozbranding; then
+		doicon "${FILESDIR}"/icon/firefox-icon.png
+		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
+			mozillafirefox-2.0.desktop
+	else
+		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5-unbranded.desktop \
+			mozillafirefox-2.0.desktop
+	fi
 
 	# Fix icons to look the same everywhere
 	insinto "${MOZILLA_FIVE_HOME}"/icons