[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox-bin/

[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox-bin/

[Nirbheek Chauhan]

commit:     c606b3d20b39edafb4da3048df6bbd21e6c1f6ae
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 05:08:43 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 05:08:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c606b3d2

www-client/firefox: sync with tree, firefox-bin: remove useless ChangeLog

---
 www-client/firefox-bin/ChangeLog             |    8 --------
 www-client/firefox-bin/Manifest              |   21 ---------------------
 www-client/firefox/Manifest                  |    2 +-
 www-client/firefox/firefox-10.0_beta6.ebuild |    2 ++
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
deleted file mode 100644
index 2291d26..0000000
--- a/www-client/firefox-bin/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for www-client/firefox-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  26 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-bin-9.0.ebuild:
-  Why the heck were we still calling update_mozilla_launcher_symlinks in
-  pkg_postrm? Nuke it from orbit. Bug 390807
-

diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 80cb526..3bdbbce 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08
 AUX firefox-bin-prefs.js 305 RMD160 c717f25e140d244844f18bc84644183cfdf7ddc9 SHA1 794edb0a7ff1c6efeadc0b89044eeb5b7d108280 SHA256 786fbfc99425ed9ba32d3e99af6b482226539a86e762197cc10e2b491c7b9d72
 AUX firefox-bin.desktop 330 RMD160 2b6b0830ea5a4ad240f9d78655ea00edd4739e2f SHA1 a5ba3492fb1433cf2b4e042bf49e28442446c6ce SHA256 5aa85d89a45e4d6706bc046173ff3be10d7af729b04b88f2378cdbda602b648a
@@ -89,22 +86,4 @@ DIST firefox-9.0-zu.xpi 238395 RMD160 67afb3fd7bd9006830747a75b5175facf8615f86 S
 DIST firefox-bin_i686-9.0.tar.bz2 16842339 RMD160 190a782228ba276d0862d44ebe5e06f6a4fb8939 SHA1 bd8652a826bfe4f3ec21425967d437582c9c4f85 SHA256 6c7a2bcfb4af5ed94fb3361380036c9cf33624330251c3c4793e26e15c50cb6c
 DIST firefox-bin_x86_64-9.0.tar.bz2 18632139 RMD160 758976ca43e41d8feab58ade1001cf9a7b86f347 SHA1 bb9674a8fec3bb3d640aa38220a4f2081454b220 SHA256 3dce7000ec01ea101370bbc9c685cc67e5b9bd0395566b887dfe5d09f7c6cd9c
 EBUILD firefox-bin-9.0.ebuild 3698 RMD160 e429bb45d79328e3e26cc363b0054cc476a04b2d SHA1 d3dad1f5511e827a833fb5eda28646d733cd5f0b SHA256 8ae43a109ca404b4cb5bda92f92ba773ed72da8cd40a136ce9081f1723f512cc
-MISC ChangeLog 320 RMD160 ca4ed7ce492d5a20d7c316d63afebd26e9bd47d0 SHA1 91974a22d768c239e7253d49590498b7c4826647 SHA256 018795b778f4c3461705c84bd0fc2282d2dcbf3ccea53e7aa7fef72a1a28d492
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPIW70AAoJEO/kOhxWD91kb5cP/2oNVjc4GT9CX7DJbbcG05yj
-rBBrasypOn8f6K9/FSeiG76jf1mPE7f9HIhjKSPZDa4X2doLTks2rSExCJuAKF2H
-d/j2Nlg6JGvJ7mU5tJ9UL3hp6ZSvT0R4vaBuunMolh92xKMcTecil9tT7s+oJQDg
-tdy4GtvD0tRtW6DxX5v3+Y5+GzCwP9GgsMgi+a6eJv3lAeglx7KuvLcYWrlHFN0K
-1lw+DO+msUKe1AMcfE0a52qkb21Zl+wDsP8Fn96N3VTtJKNPXgxWAOzEZxoL7bTP
-KqCQtbMqm5LCxYWUd/BdY+y4Tz6ETRaQ/MsC6G18X3RmRirtVVf4ifmX+LuMm1ww
-9MyvFC3dBMv37oqXaq7o3LBPCNwAA/ZVwXt1BpMks9aD0IgkM030ialV2Bg4r0YE
-AgqNH8zHF+4TSb7QjdoWP3PtqZnNOdTR4ERULuDwoqZ5jnnPZH+wuLlRTuGV+ZVr
-/zG328Q4WPW9mDDn43cph+5qbsyER/gLmm5B1re2Wc/M4VoJX7Qk/gCNXezJ5gto
-cazsQ/dNoDWk0OtDI8mfkVc7DKL/NKaHUIfW0+3jl66hnfhH6s3eOF4THeeuU0qf
-vcXh+zspOhB1OFn+PC0RhGm33+Oc0aICRyywouHfHavsI8goVsF2DnjXFnc1JrrQ
-BGXZbidV5FHMmUVMsmUb
-=50RW
------END PGP SIGNATURE-----

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index cd1f41e..175994f 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -2,4 +2,4 @@ AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260e
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-10.0-patches-0.2.tar.xz 7788 RMD160 94950ce48340fd774c9e2d742d633da8820396bc SHA1 f4d48aa446bc5d52bd8686fb8235591f68db0d88 SHA256 81a3bda55f8f15f2e985ff34c94b2e64ee09e5b019f523325762a122ebbeaa39
 DIST firefox-10.0b6.source.tar.bz2 75442266 RMD160 c841efc74a23f6c3317bf75bbc22940a1adf8d9c SHA1 90d207968ac4224d22406ce59b823612638d9791 SHA256 3fc5d2d598acbfec7eab1411bdd9b1442514b33e0b32f66c1e58370c99496693
-EBUILD firefox-10.0_beta6.ebuild 9912 RMD160 0acd5bc9d9cf32a96f30eab28e49399daa3d04e3 SHA1 3c4136b83d4ff5d2468236f152bb1b9e28f37480 SHA256 70bd6e7478c711d10d48c411f255d4ded2766c446095533038c17924645e2a2b
+EBUILD firefox-10.0_beta6.ebuild 10001 RMD160 8984330cdf1c59cd5c4676dd839e6600636f1a09 SHA1 6b6560dd1f44b2da9fbe150a2e051287936b6847 SHA256 17e13f65fc6a0b7fbe3a6844cf284efc98365abe590b4cc374c640d268ced005

diff --git a/www-client/firefox/firefox-10.0_beta6.ebuild b/www-client/firefox/firefox-10.0_beta6.ebuild
index c2dfac7..73143e4 100644
--- a/www-client/firefox/firefox-10.0_beta6.ebuild
+++ b/www-client/firefox/firefox-10.0_beta6.ebuild
@@ -215,6 +215,8 @@ src_compile() {
 	if use pgo; then
 		addpredict /root
 		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
 
 		# Firefox tries to use dri stuff when it's run, see bug 380283
 		shopt -s nullglob