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

Package-Manager: portage-2.1.4.4

6 files changed, 17 insertions, 12 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/Manifest b/www-client/mozilla-firefox/Manifest
index 9bb5c3ef94ad..da5b352a2257 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,7 +1,5 @@
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 AUX gentoo-default-prefs.js 565 RMD160 2cc248e9375e75d86d90cf4f5b4634b384df9aa6 SHA1 3adfdb6763fa340b87a0b0ddeb23c6aeca025d4c SHA256 12deb91fe8d41eaa27b45eec7b9a431025b262ea0a29f08f66253fb85dec6916
-AUX icon/firefox-icon-unbranded.png 2963 RMD160 4244d088d65b03d34ee7a66ed9145064d930013a SHA1 0b4ed3d1bb9be7ba8278eac49f465afb39b89b6e SHA256 a3413e62d6d7088f5ca5be575cb1af933187d828a8dfb4e49552a2441958d6a8
-AUX icon/firefox-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e
 AUX icon/iceweasel.desktop 251 RMD160 56a1e32c06c3bd460d15f5fc56d23293cffd62bd SHA1 51f9c9e098e2ce565569b220987b714ebed27e38 SHA256 04b952df4b80af25ea9cfb93fc992f921120c491f52640680e2b70b96ebc7dd7
 AUX icon/mozilla-firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
 AUX icon/mozilla-firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
@@ -98,7 +96,7 @@ DIST mozilla-firefox-2.0.0.12-tr.xpi 148658 RMD160 7f1290b74bb98f5d73f86c2d79883
 DIST mozilla-firefox-2.0.0.12-uk.xpi 158420 RMD160 40c8a3026049918b47798de4a309d3cdf2bffe3c SHA1 2ddec772ee74d0471ed1920fc5c910000c28d705 SHA256 a2faecb10ee6511a6f55201b8feee2d630ad51a544badbed205b2b2f283832f0
 DIST mozilla-firefox-2.0.0.12-zh-CN.xpi 139266 RMD160 f7cb9f25e0e494fd8aa011ecd974b100fdf0500a SHA1 aa7f6c6a65624b8ac5d07cab2ab9c62f31d9a736 SHA256 320f43ee5f4ce297cf99307fc9fea33ae7b7f300e55cd44592d1932047818d29
 DIST mozilla-firefox-2.0.0.12-zh-TW.xpi 141996 RMD160 585278ad480ef28c40f780a24810960fa6d14d25 SHA1 b19e38a768ba159ea31a099a658cf0d1f3668da3 SHA256 8ce68fc2f8681ddd798048385ecf85548f235a359bd6ee6ed7738cf9d55c07db
-EBUILD mozilla-firefox-2.0.0.11.ebuild 9872 RMD160 8d11504b554bb7d704f94173e1d78019e270e068 SHA1 99eef3f6f86557de49599a7e79dfedcd8767a599 SHA256 835c91ee2974a233a4ae046070940fa03003298fd090a0a78429ec41c4363b2c
-EBUILD mozilla-firefox-2.0.0.12.ebuild 9882 RMD160 1974c588f43719016c7bc49474acf56b8b6d63d9 SHA1 eb3f3fa0f4a7eaae7a3e286d3847a04df9e1a4c9 SHA256 1a8e0d52f4ca8b0b4f66d5086bad5404ad39e22c4d4300e3ac403d13c56a0f3c
-MISC ChangeLog 78584 RMD160 3192737aa59eb87a98df48d8972c521cb121a0dc SHA1 f06e75dfdadb00455ca40dcc02d8e40868f34796 SHA256 79a9b6894ec2605e03280503df59d0c10740e1f82eab8d69a34683edc8465841
+EBUILD mozilla-firefox-2.0.0.11.ebuild 9934 RMD160 6e0f12ef429254fa9d8435ad712011e5685b9fa2 SHA1 f2da9909534bbcba5e5bae617fafbba0025e4580 SHA256 734e54f15ecff9e4367203f49aca4c9eaefce6c705f6d5cccf29bdff8beb8027
+EBUILD mozilla-firefox-2.0.0.12.ebuild 9993 RMD160 86c358d9037707b2c3b7dcc4cf63ffc066f0501e SHA1 f3875c2c95465acc0cc3977033f65cb6fc845801 SHA256 d3d721d5faea984c0845a52069142a6c3bf01bd7408d2a9ee25c6370466f2a7d
+MISC ChangeLog 78896 RMD160 2c2c910c97d17bbe5f67237978125eee894657f1 SHA1 24e2b9dcf18705c201b526b9890405da0fc8ce2c SHA256 6f20ea0a63ab0def007592fed9c3a66cb7eb35033cedfe4b6b3de09eb2ce6133
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
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