Add iceweasel branding, to make rbu happy

Package-Manager: portage-2.1.4.4

4 files changed, 43 insertions, 14 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 7093f5147bc0..2ecb30cee4b7 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.416 2008/06/20 14:41:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.417 2008/06/21 19:34:53 armin76 Exp $
+
+  21 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  mozilla-firefox-3.0-r1.ebuild:
+  Add iceweasel branding, to make rbu happy
 
   20 Jun 2008; Raúl Porcel <armin76@gentoo.org>
   mozilla-firefox-3.0-r1.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index af4f1a4f6285..8486f4fcda87 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -149,6 +149,6 @@ DIST mozilla-firefox-3.0.tar.bz2 11530763 RMD160 1c814957d36b12414d45f8432b3dbe2
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD mozilla-firefox-2.0.0.11.ebuild 9932 RMD160 fb61c475c0ceecc05b618f5e43d2e18ff38daef7 SHA1 f21f55d6dace4dc7e0f1f39624dd7996d766900b SHA256 52cb6783ddb30c4f0e9951d584b77e53797cfa23d80aaa059c1990ea53589b23
 EBUILD mozilla-firefox-2.0.0.14.ebuild 10393 RMD160 73fc1259fb9bdd0316d3daabf9903b5287ad23d8 SHA1 efc6ac8086a3f14d39d87e02b106ae7d5c9c5a42 SHA256 3d5586ab7e7c807253bb5086b26eda9334f5f8b1277e12f3316643bcd7585363
-EBUILD mozilla-firefox-3.0-r1.ebuild 9790 RMD160 abfaca9aa5c26bb0a57122be5f919c01af127ff1 SHA1 01f8f2e1efc5942184e18ca9cef1372c9f740eea SHA256 7fcd72a8ff902155e67b84e2fd24c4d4e3ee6510025ea5d74a04e2d13a63bfb2
-MISC ChangeLog 84602 RMD160 42a6961513a3a37b293d853790470b251de9cd5e SHA1 9094f489a769a908196260900ac81e8398a0daec SHA256 ce7ba29e0bf0d91857220ac9fcc3aff7157ef6ad67ed9c54053f3a684e193ee8
+EBUILD mozilla-firefox-3.0-r1.ebuild 10270 RMD160 d39134a0c3737c6d76297691373567b2cec6b18d SHA1 707994dbe3e34313980cc5ad45b78df8f4f3d7ab SHA256 de67916d53bb7c164a1aa10050fa0ff3e913486b3c14976c4056d23b9374aa5a
+MISC ChangeLog 84729 RMD160 aefe89234c2948e6685e515081295ce49110a149 SHA1 9759f8df11787450f959d6fad4a950f58598e115 SHA256 83e14adca29d3b30e9c84790e951629413b32714c4497224a8b0a737f959370a
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild
index c49e63f804b8..a37bd99446f8 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.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-3.0-r1.ebuild,v 1.2 2008/06/20 14:41:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild,v 1.3 2008/06/21 19:34:53 armin76 Exp $
 EAPI="1"
 WANT_AUTOCONF="2.1"
 
@@ -18,11 +18,12 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="java mozdevelop bindist restrict-javascript +xulrunner"
+IUSE="java mozdevelop bindist restrict-javascript iceweasel +xulrunner"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~armin76/${P}.tar.bz2
 	mirror://gentoo/${PATCH}.tar.bz2
+	iceweasel? ( mirror://gentoo/iceweasel-icons-2.0.0.11.tar.bz2 )
 	!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )"
 
 # These are in
@@ -104,7 +105,7 @@ pkg_setup(){
 		die "Pango 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"
@@ -117,6 +118,12 @@ src_unpack() {
 	! use xulrunner && unpack xulrunner-1.9${MY_PV}.tar.bz2
 	unpack ${P}.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"
@@ -134,6 +141,11 @@ src_unpack() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
+	if use iceweasel; then
+		sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* \
+			browser/branding/nightly/configure.sh
+	fi
+
 	eautoreconf
 
 	# We need to re-patch this because autoreconf overwrites it
@@ -177,7 +189,7 @@ src_compile() {
 		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use iceweasel; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -252,8 +264,12 @@ src_install() {
 	fi
 
 	# Install icon and .desktop for menu entry
-	if ! use bindist; then
-		 newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
+	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
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-3.0.desktop
 	else
@@ -289,9 +305,8 @@ pkg_postinst() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 
 	ewarn "All the packages built against ${PN} won't compile,"
-	ewarn "since they should be built against net-libs/xulrunner,"
-	ewarn "therefore you should check if your package builds against"
-	ewarn "xulrunner and if it doesn't, file a bug, thanks."
+	ewarn "if after installing firefox 3.0 you get some blockers,"
+	ewarn "please add 'xulrunner' to your USE-flags."
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/ochusha/Manifest b/www-client/ochusha/Manifest
index 68bd30ed6bf5..93d6306ba60a 100644
--- a/www-client/ochusha/Manifest
+++ b/www-client/ochusha/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ochusha-0.5.8.2-gentoo.diff 2394 RMD160 8d83d5fcdbd4c20cea82738d0febb9e903e12ba2 SHA1 3f463e332ef18c55ca2c01869e83c6eecd4ab508 SHA256 f10027ffb52ec47f633ff3289e5cd009846ecee64880a548af7161584c9e4ed8
 AUX ochusha-0.5.8.2-glib-2.10.diff 1237 RMD160 ea6e9d768031afec304355ae0fb99df29be2e38a SHA1 667ded9a9c20e194c7c327b5138157347046d29f SHA256 f0948301d7a8ec3284dba7998a1817f375d268effaafb232023932ac44a0b2f1
 AUX ochusha-0.5.8.2-glibc2.diff 370 RMD160 6f331c7818b630822b7b74157b4120975f6eea8e SHA1 b71a0719975b7d537e55eea585554d85fa4bb8ed SHA256 c0e68e9319ecec5069bc2d7bae01a4be7fe60a79159a9e2d4987240d16930ef6
@@ -6,6 +9,13 @@ AUX ochusha-0.5.8.2-type-punning.diff 1238 RMD160 b38fb1708042488bf6597a277e9576
 DIST ochusha-0.5.8.2.tar.bz2 1794268 RMD160 5990fd327165b3d3c415aec5639babe1ce9ad6ba SHA1 1b302b9cc084d5e44eb32b68f67399f6f37deda1 SHA256 91a4429b085be335ad34c9af3ed2ab8871b6245839348abe21073a48789dbe7c
 EBUILD ochusha-0.5.8.2-r1.ebuild 1151 RMD160 0617e0f078062308cbcc1cdb722d5635bc8dc911 SHA1 0ebe52f7976c26fe5a764a5946449b1e2d2d7d07 SHA256 8a509d43441444109279b61a630f49c6f55a119c51ee5e328c1e58c15df198fa
 EBUILD ochusha-0.5.8.2-r2.ebuild 1526 RMD160 69d18d4f6d487baddb93b36566d31a90623e4511 SHA1 fd0efe5fcc39f1c29febfe1d04fcdab816828654 SHA256 1bc45b84d755fb838cab9d16bd0da9522d2af7f336d3ea6685b3ffa8310af089
-EBUILD ochusha-0.5.8.2-r3.ebuild 1560 RMD160 25265019844d8c2b7822ac23f567dd3e5946fda8 SHA1 36cc1ab9e1b72d68c549552ceb006617dc610fb1 SHA256 cad1a9aff8ea3884bbb0aa4ece792181bea5d5fba90b61c7e97f365d68c5be69
-MISC ChangeLog 10891 RMD160 397e3dc6391df68607da7f5bd9d56789f3a6be61 SHA1 ae725ddd28b7f2a8fa53b1362f6585ef9329b7fd SHA256 9ece300274ed92a33530ff45fce792a7c9587b4600fe4184c7c303ff53e76cab
+EBUILD ochusha-0.5.8.2-r3.ebuild 1558 RMD160 4d2cfa55b6f832b5242e336b79bae5defb2f7922 SHA1 1e0e8f6dac2071e321a59dd6f1ff9382568a8d0e SHA256 76012a77030cce7b2da49a94143131c3921f7fefee41fdb3ee21091b667e6fff
+MISC ChangeLog 11000 RMD160 8c25f419358322a2b1e101c7f5c3973f6328e867 SHA1 e255185551bfee0fba0946cd9e957403db65b826 SHA256 a417e2bc315d90bd3604fddbe7e47fcd8340b4308bc8a608d277027d73013169
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhdWHcACgkQNQqtfCuFneOq4QCfcOIGAsU4lD4KvoLy34wxY8Xq
+NbAAnjNYfO04MI7ZD55JWUdWTe7CVpl4
+=WrSQ
+-----END PGP SIGNATURE-----