Use icons in the tarball instead, bug #204312, and report correct browser name when iceweasel is enabled, bug #210308

(Portage version: 2.1.4.4)

5 files changed, 14 insertions, 7 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 4c24d7b41023..c6df50114c55 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.377 2008/02/14 14:18:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.378 2008/02/29 15:02:58 armin76 Exp $
+
+  29 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/icon/firefox-icon.png, -files/icon/firefox-icon-unbranded.png,
+  mozilla-firefox-2.0.0.11.ebuild, mozilla-firefox-2.0.0.12.ebuild:
+  Use icons in the tarball instead, bug #204312, and report correct browser
+  name when iceweasel is enabled, bug #210308
 
   14 Feb 2008; Raúl Porcel <armin76@gentoo.org>
   files/icon/mozilla-firefox-1.5-unbranded.desktop,
diff --git a/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png b/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png
deleted file mode 100644
index 22aac8114adc..000000000000
--- a/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png
+++ /dev/null
diff --git a/www-client/mozilla-firefox/files/icon/firefox-icon.png b/www-client/mozilla-firefox/files/icon/firefox-icon.png
deleted file mode 100644
index b7ff7197cad1..000000000000
--- a/www-client/mozilla-firefox/files/icon/firefox-icon.png
+++ /dev/null
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild
index b11e2124d6c0..a0e80320b1c8 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.11.ebuild,v 1.15 2008/02/02 17:11:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild,v 1.16 2008/02/29 15:02:58 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -247,11 +247,11 @@ src_install() {
 		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
 			mozilla-firefox-2.0.desktop
 	elif ! use bindist; then
-		doicon "${FILESDIR}"/icon/firefox-icon.png
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-2.0.desktop
 	else
-		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
+		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			mozilla-firefox-2.0.desktop
 	fi
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild
index a5c88b20ee66..e97b1ed88684 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.12.ebuild,v 1.6 2008/02/11 00:17:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild,v 1.7 2008/02/29 15:02:58 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -129,6 +129,7 @@ src_unpack() {
 
 	if use iceweasel; then
 		sed -i -e "s|Bon Echo|Iceweasel|" browser/locales/en-US/chrome/branding/brand.*
+		sed -i -e "s|BonEcho|Iceweasel|" configure.in
 	fi
 
 	eautoreconf
@@ -247,11 +248,11 @@ src_install() {
 		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
 			mozilla-firefox-2.0.desktop
 	elif ! use bindist; then
-		doicon "${FILESDIR}"/icon/firefox-icon.png
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-2.0.desktop
 	else
-		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
+		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			mozilla-firefox-2.0.desktop
 	fi