Bump patchset for g/fbsd wrt bug 169825 and fix bug 150419

Package-Manager: portage-2.1.2.2

4 files changed, 30 insertions, 32 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 29085695f886..43ccfe1e0072 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.271 2007/03/05 22:04:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.272 2007/03/08 22:05:42 armin76 Exp $
+
+  08 Mar 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-firefox-2.0.0.2.ebuild:
+  Bump patchset for g/fbsd wrt bug 169825 and fix bug 150419
 
   05 Mar 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-firefox-2.0.0.2.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 5822aaeb5b6c..335214984f20 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538
@@ -256,7 +253,7 @@ DIST mozilla-firefox-2.0.0.2-nb-NO.xpi 163827 RMD160 860a9173e13be00f36879c484fa
 DIST mozilla-firefox-2.0.0.2-nl.xpi 170129 RMD160 47d6dc62c63c8682a7ee2add1c5f60cc2d66d3f9 SHA1 232ed4da57364eac61dfe607ee7d470db3bf0127 SHA256 784570aa4566a18dbd55ea4f9aced8111aa60a453cd20a6401f7d5e932350e97
 DIST mozilla-firefox-2.0.0.2-nn-NO.xpi 160799 RMD160 5dc1fc3c9d66168df205b5422d3264b3a868771f SHA1 45db2061ed064b600ee6b54390631c0155cf5a81 SHA256 f00a7dc68a9c5acfaeeacde2e4f9b793e881aef31bea4e08bbe457e80b706de9
 DIST mozilla-firefox-2.0.0.2-pa-IN.xpi 161687 RMD160 1769ce9ed7bf4bef6eab87b3d15c405115ca658c SHA1 e37dd8318f904eda7e447c8c691127a49e2832b0 SHA256 7b33224aa5c596cd8dfc34405633ad203af692918a0a7044ad45a6f31b4c9607
-DIST mozilla-firefox-2.0.0.2-patches-0.4.tar.bz2 33610 RMD160 e85d21400762831eec8edb338f674383bfa88e09 SHA1 f7a4da703977c3cfb8bab5f21a15ee581c9ac580 SHA256 b77e6767b781c9f69331c2849474c3244a54c17f177987b671d102cb6b2ed639
+DIST mozilla-firefox-2.0.0.2-patches-0.5.tar.bz2 34074 RMD160 c748dd8c60b01705b308bfbc07680596cb3022a8 SHA1 30f16ddd08fde0704a972648bd43c7a48605e3ed SHA256 beef27f9ecdb514eabd2c4f0fe0efe08f25d8cfaadbbf81dbfdc9f7225a395a1
 DIST mozilla-firefox-2.0.0.2-pl.xpi 171089 RMD160 fb82e0af5db5150cfdccde1146a1d853b798f7f5 SHA1 d5de6bd2a96c5568c642b2b727576b0df83043cc SHA256 031d59a207a30b677c296e67ef5265936662315937f169caab62801359bcd855
 DIST mozilla-firefox-2.0.0.2-pt-BR.xpi 153380 RMD160 1c60bf641ee3f5c98ae12e8bd3d6dff6e1d326ba SHA1 ba556769b4fd268532c1279c5f1a3ff25d12abd8 SHA256 294a8bd38e33daad4d89ddfae44ad70843a13ddeb7cd1b65ab15eec00bbd6a4d
 DIST mozilla-firefox-2.0.0.2-pt-PT.xpi 153607 RMD160 593b0088f0b820790f9ec8d1ce42386fdaee37c5 SHA1 f3c48a93ad3e656412b6f9374a24cdfd34d7d43e SHA256 c45f4e178d6d69a3b4fc0d20c114ed7c755e6871caa1e6cb4a3d81bebd5563ad
@@ -299,14 +296,14 @@ EBUILD mozilla-firefox-2.0.0.1.ebuild 8880 RMD160 77d6fa2f47c693d090ac92dca6dd0e
 MD5 54b29b50efaa9bfc295ac8f1e63d849e mozilla-firefox-2.0.0.1.ebuild 8880
 RMD160 77d6fa2f47c693d090ac92dca6dd0e3ddbdae5d6 mozilla-firefox-2.0.0.1.ebuild 8880
 SHA256 dae02725d82f6b76c1ab0eb795a23e611697dd07e9d77be6eab98f7208905d01 mozilla-firefox-2.0.0.1.ebuild 8880
-EBUILD mozilla-firefox-2.0.0.2.ebuild 8891 RMD160 dcc1a1ff47a6ae4779a90776d38e3e2a506ca233 SHA1 66ecdd9426cfd9302b6af4224f594e023d5b5429 SHA256 4fd0ef26995efa359a09b7c96de1c6f8a2751e3e8e932ac90fdb54125cdf5d05
-MD5 fe6f843e0ec47a49a32c006ee16fbe56 mozilla-firefox-2.0.0.2.ebuild 8891
-RMD160 dcc1a1ff47a6ae4779a90776d38e3e2a506ca233 mozilla-firefox-2.0.0.2.ebuild 8891
-SHA256 4fd0ef26995efa359a09b7c96de1c6f8a2751e3e8e932ac90fdb54125cdf5d05 mozilla-firefox-2.0.0.2.ebuild 8891
-MISC ChangeLog 63750 RMD160 b62d0ba61e4656bde35c9b8263b9a0f64162b039 SHA1 ec765cb8874cf2b3a73a86125e5089a63fa0a1cc SHA256 01dcba2792fd82fcaa769d79056832881db9f3b37f583d3f02438b42a2e10d35
-MD5 aee2dbcb28d63def98658e5418ddcd10 ChangeLog 63750
-RMD160 b62d0ba61e4656bde35c9b8263b9a0f64162b039 ChangeLog 63750
-SHA256 01dcba2792fd82fcaa769d79056832881db9f3b37f583d3f02438b42a2e10d35 ChangeLog 63750
+EBUILD mozilla-firefox-2.0.0.2.ebuild 9070 RMD160 789826535147ac973b2ff56dbd81c44562f6ad5d SHA1 8e2f93a3a278d3ba9519657a2318aa44b2b6cf0e SHA256 3cb72d069f19a254c58dc2a17c99ad04fedd0f7c46b1f8bef8350fb5df72bdb1
+MD5 98e6b4959ef84c70abb637441b1803d8 mozilla-firefox-2.0.0.2.ebuild 9070
+RMD160 789826535147ac973b2ff56dbd81c44562f6ad5d mozilla-firefox-2.0.0.2.ebuild 9070
+SHA256 3cb72d069f19a254c58dc2a17c99ad04fedd0f7c46b1f8bef8350fb5df72bdb1 mozilla-firefox-2.0.0.2.ebuild 9070
+MISC ChangeLog 63895 RMD160 446c774f54cd8ab7b9668ec0c435b56c7d6f3a46 SHA1 4c678246b82c73dea4c34cc140387224f057a271 SHA256 5f77a20c8eaab0116d242b90d4673e605201da8ced3dfb3767a1787e67a2dfa8
+MD5 eae556706739deda2aac0d459efe31f1 ChangeLog 63895
+RMD160 446c774f54cd8ab7b9668ec0c435b56c7d6f3a46 ChangeLog 63895
+SHA256 5f77a20c8eaab0116d242b90d4673e605201da8ced3dfb3767a1787e67a2dfa8 ChangeLog 63895
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -335,13 +332,6 @@ SHA256 a5f2ab7aa56bde6b81a2dd74d09e98fb6f66da0007e3bd5b69a54624e39da940 files/di
 MD5 f6c73fab83cc9c3f805b3c2064143779 files/digest-mozilla-firefox-2.0.0.1-r4 11550
 RMD160 8b983801dfe1a22211c9d3ea57a377585f1722fa files/digest-mozilla-firefox-2.0.0.1-r4 11550
 SHA256 a198fdcc398feb415e06c32dce2eea69449ad8274a3d855ffd1942a5a4ad546a files/digest-mozilla-firefox-2.0.0.1-r4 11550
-MD5 4307f5ed8ec3996833bdc4937705f816 files/digest-mozilla-firefox-2.0.0.2 12092
-RMD160 f413bb045399eb100ad4077f02ea86b452f12e1b files/digest-mozilla-firefox-2.0.0.2 12092
-SHA256 377eb109be34c1477b6b8ab4978df115022df584e33e317059574b749b3c4655 files/digest-mozilla-firefox-2.0.0.2 12092
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF8GVC8bi6rjpTunYRAg3PAKCL0oRMUD2AFZHObLC7sykY9/NWCgCgpb2P
-udXtOLW3IlBqAqZ+m0q/djo=
-=i86m
------END PGP SIGNATURE-----
+MD5 775b83bdbf194e384f5c09700bdd4223 files/digest-mozilla-firefox-2.0.0.2 12092
+RMD160 c8df1cd6f33c84991d14a799820f9c3fd0df57ab files/digest-mozilla-firefox-2.0.0.2 12092
+SHA256 082c53a310ef99aa6e36c0643f6306eb631ea286687836551b7065bc77a82b3d files/digest-mozilla-firefox-2.0.0.2 12092
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
index 18975edeeea1..b4e97407875e 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
@@ -97,9 +97,9 @@ SHA256 f00a7dc68a9c5acfaeeacde2e4f9b793e881aef31bea4e08bbe457e80b706de9 mozilla-
 MD5 a17d963fa902fff1776c3d2f3b70e3c1 mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
 RMD160 1769ce9ed7bf4bef6eab87b3d15c405115ca658c mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
 SHA256 7b33224aa5c596cd8dfc34405633ad203af692918a0a7044ad45a6f31b4c9607 mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
-MD5 95408877c2c4747487f33cb4d8fa18d3 mozilla-firefox-2.0.0.2-patches-0.4.tar.bz2 33610
-RMD160 e85d21400762831eec8edb338f674383bfa88e09 mozilla-firefox-2.0.0.2-patches-0.4.tar.bz2 33610
-SHA256 b77e6767b781c9f69331c2849474c3244a54c17f177987b671d102cb6b2ed639 mozilla-firefox-2.0.0.2-patches-0.4.tar.bz2 33610
+MD5 7f14d89cde625dbc7cf90e943d876f79 mozilla-firefox-2.0.0.2-patches-0.5.tar.bz2 34074
+RMD160 c748dd8c60b01705b308bfbc07680596cb3022a8 mozilla-firefox-2.0.0.2-patches-0.5.tar.bz2 34074
+SHA256 beef27f9ecdb514eabd2c4f0fe0efe08f25d8cfaadbbf81dbfdc9f7225a395a1 mozilla-firefox-2.0.0.2-patches-0.5.tar.bz2 34074
 MD5 53db0bc51f752f8c0e171f4a6dc143ad mozilla-firefox-2.0.0.2-pl.xpi 171089
 RMD160 fb82e0af5db5150cfdccde1146a1d853b798f7f5 mozilla-firefox-2.0.0.2-pl.xpi 171089
 SHA256 031d59a207a30b677c296e67ef5265936662315937f169caab62801359bcd855 mozilla-firefox-2.0.0.2-pl.xpi 171089
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
index 6970d09ca82c..b1c080d416ea 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
@@ -1,19 +1,19 @@
 # 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.2.ebuild,v 1.15 2007/03/08 19:33:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild,v 1.16 2007/03/08 22:05:42 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
-PATCH="${P}-patches-0.4"
+PATCH="${P}-patches-0.5"
 LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="java mozdevelop bindist xforms restrict-javascript filepicker"
@@ -52,6 +52,13 @@ PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
 
 S="${WORKDIR}/mozilla"
 
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=browser
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
 linguas() {
 	local LANG SLANG
 	for LANG in ${LINGUAS}; do
@@ -148,9 +155,6 @@ src_compile() {
 	mozconfig_use_extension mozdevelop venkman
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
-	# Add build variables
-	mozconfig_build_opts
-
 	# Finalize and report settings
 	mozconfig_final