Add iceweasel branding

(Portage version: 2.1.3.19)

4 files changed, 38 insertions, 7 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 81d8536d2cbd..926102740710 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.362 2007/12/07 10:56:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.363 2007/12/14 17:38:02 armin76 Exp $
+
+  14 Dec 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/iceweasel.desktop, mozilla-firefox-2.0.0.11.ebuild:
+  Add iceweasel branding
 
   07 Dec 2007; Raúl Porcel <armin76@gentoo.org>
   -mozilla-firefox-2.0.0.10.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.11 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.11
index 9822b71afdb8..7b5271aa93b4 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.11
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.11
@@ -1,6 +1,9 @@
 MD5 b2f982f9f3085195d4797957537ca75d firefox-2.0.0.11-source.tar.bz2 37480419
 RMD160 fd408c9aa6df1b867e757865e8dccabebef3dee2 firefox-2.0.0.11-source.tar.bz2 37480419
 SHA256 1b98b8cd061fc0471887a19ca83ef73043f9aab87dacfedae93a388d478f914d firefox-2.0.0.11-source.tar.bz2 37480419
+MD5 611f37c96ac9df245b83ec76eab13d81 iceweasel-icons-2.0.0.11.tar.bz2 186529
+RMD160 8687d1b9ebcbd775a8ab72b51e5d96a2e8725484 iceweasel-icons-2.0.0.11.tar.bz2 186529
+SHA256 df1d6fb36417e770cf444c44a1e3a5c00b56ab0f485aa0c9a7b60e217cfe45f9 iceweasel-icons-2.0.0.11.tar.bz2 186529
 MD5 4636e57cc9c88da7c64b8f8efbeaa7c4 mozilla-firefox-2.0.0.11-af.xpi 148047
 RMD160 efce849f322d2a14ce732072d624eb804c529c0d mozilla-firefox-2.0.0.11-af.xpi 148047
 SHA256 96a3b302f462d5b0b651ab797fd1a29719c8977e240b502cc288ee833df6e2b8 mozilla-firefox-2.0.0.11-af.xpi 148047
diff --git a/www-client/mozilla-firefox/files/icon/iceweasel.desktop b/www-client/mozilla-firefox/files/icon/iceweasel.desktop
new file mode 100644
index 000000000000..935823689e9b
--- /dev/null
+++ b/www-client/mozilla-firefox/files/icon/iceweasel.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Iceweasel
+Comment=Web Browser
+Exec=/usr/bin/firefox %U
+Icon=iceweasel-icon.png
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml
+Categories=Network;WebBrowser;
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 d3e49451e724..cd06777b48f2 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-2007 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.8 2007/12/13 20:31:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild,v 1.9 2007/12/14 17:38:02 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -16,11 +16,12 @@ HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="java mozdevelop bindist xforms restrict-javascript filepicker"
+IUSE="java mozdevelop bindist xforms restrict-javascript filepicker iceweasel"
 
 MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
 SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2"
+	mirror://gentoo/${PATCH}.tar.bz2
+	iceweasel? ( mirror://gentoo/iceweasel-icons-2.0.0.11.tar.bz2 )"
 
 # These are in
 #
@@ -88,7 +89,7 @@ pkg_setup(){
 		die "Cairo needs X"
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use iceweasel; then
 		elog "You are enabling official branding. You may not redistribute this build"
 		elog "to any users on your network or the internet. Doing so puts yourself into"
 		elog "a legal problem with Mozilla Foundation"
@@ -102,6 +103,12 @@ pkg_setup(){
 src_unpack() {
 	unpack firefox-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
 
+	if use iceweasel; then
+		unpack iceweasel-icons-2.0.0.11.tar.bz2
+
+		cp -r iceweaselicons/browser mozilla/
+	fi
+
 	linguas
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
@@ -120,6 +127,10 @@ src_unpack() {
 		epatch "${FILESDIR}"/mozilla-filepicker.patch
 	fi
 
+	if use iceweasel; then
+		sed -i -e "s|Bon Echo|Iceweasel|" browser/locales/en-US/chrome/branding/brand.*
+	fi
+
 	eautoreconf
 }
 
@@ -145,7 +156,7 @@ src_compile() {
 		echo "ac_cv_visibility_pragma=no" >>  "${S}/.mozconfig"
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use iceweasel; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -231,7 +242,11 @@ src_install() {
 	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
 
 	# Install icon and .desktop for menu entry
-	if ! use bindist; then
+	if use iceweasel; then
+		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
+		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
+			mozilla-firefox-2.0.desktop
+	elif ! use bindist; then
 		doicon "${FILESDIR}"/icon/firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-2.0.desktop