Fix bug 372843, and avoid exporting XAUTHORITY as well

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

4 files changed, 54 insertions, 19 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index a05b601ea3c3..1f6b1ca0352a 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.75 2011/06/25 14:24:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.76 2011/06/26 05:59:53 nirbheek Exp $
+
+  26 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-5.0.ebuild,
+  +files/firefox-5.0-fix-title.patch:
+  Fix bug 372843, and avoid exporting XAUTHORITY as well
 
   25 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-5.0.ebuild:
   Fix bug 372845 (pgo needs python[sqlite]), bug 372817 (sandbox violations),
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5f06e129ee87..446481bb990c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
 AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
 AUX firefox-3.0-solaris64.patch 416 RMD160 f59eaf44b797715d6116f0f151803ec6c26587c1 SHA1 c6cbd37cc2f20a1bdc347b33ff8cdd8b9e159424 SHA256 5d2f04928d820460b099a0baa92ed2d681d75b5634c21364997be216214f5597
+AUX firefox-5.0-fix-title.patch 723 RMD160 a5474b4e5aac7a947cedf1a50acaa06779b851e6 SHA1 8a4d60ce71e76577c569bf83ebca30de9ef6af97 SHA256 72fb887a845de23ceb6f300415df0182eebfd4d29d46adc9b06d850e5315dc7a
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
@@ -395,23 +396,23 @@ EBUILD firefox-3.6.12.ebuild 9508 RMD160 e6b40bd52e35691eb6555a907049a3e326cbeb4
 EBUILD firefox-3.6.17.ebuild 9453 RMD160 877c8bf7441925e36687e08e598ff290b25374f1 SHA1 18b1a63b6cece37c3b94139069d5520520738ba0 SHA256 495299be97ed6b650c6d8f5f0044ec2fc74c0bfb2dc8baa79ee9801dd09de92f
 EBUILD firefox-3.6.18.ebuild 9465 RMD160 06b69070b29ff7187bb663b1007a3db1c4dae06b SHA1 6e8a2da98abd0ab6419af3be02156ca9d04ac434 SHA256 dbae0686c9bd1a6b7e12222b9c13214e3902a7d6161d83ee2b2bcda9e763435b
 EBUILD firefox-4.0.1-r1.ebuild 7999 RMD160 744aa73bc524584610bd5086a9c74519b4ada62b SHA1 190d20749be4463b594d56922bd77e19993da690 SHA256 1b426e0ea6be5c55695fd89ecbe8834b3e6469e060bad034aecfc1faf7d37770
-EBUILD firefox-5.0.ebuild 9882 RMD160 603f6107cff1031f0e221e546fc65e72ef56ca15 SHA1 338bc8bf641cc80c63fb3ee7bdff5be56ff2f236 SHA256 4ee458da7f4b6c268ef800033ca64441a45abc3070699fbce5b6bf32f0254bd0
-MISC ChangeLog 128755 RMD160 0e43ef70edfce8e771c861e1432fb63713e6546e SHA1 f3f11da9e1c196022ccaa3f9b69e9612f38c7ec8 SHA256 2c0851c3c92e0261763d1b1349bb1a0f516cf2c1a5fd92c1ef83268332dbc79f
+EBUILD firefox-5.0.ebuild 9987 RMD160 a737981d94ebe68182827f4e936bac678b707362 SHA1 75199aef84e767ad312260396d6889eef40a1723 SHA256 5f1ece2b3c98e645ed145dce271f71a3d0ca25db43c71ad1b6f7a75e18fba0b5
+MISC ChangeLog 128925 RMD160 ae76ac26344d2ba2d11976813db0adaa03b0943b SHA1 7684141b1826fe4151edabfdc8da3d12bb578fb0 SHA256 8f5ffb599808e921ec533ff5078e50ade39775575747d9c83d25e693ed55291f
 MISC metadata.xml 938 RMD160 c224cd3636922ebff41f85dbfaebe10288c4e40f SHA1 6b5a9820d19c046a9d657470bcc800d29587ad9a SHA256 3a2d3c374034f884382fc1cecba69b93608d899fafacf37da4c02c3a3e880fba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOBe+3AAoJEO/kOhxWD91kT1EP/ApQrKmxRF1OnUpFMXuaOCT2
-aGj4nRlIhp3hDHTk5tsxP8waZVCVDy1aUa8+ZwLcYNq8mVmv1HRv9QA8j5OpB6c1
-AJAFUw+P9Y7IKRfbPL/R86mA6NTUDMr0S0J52n3d26qxxqD2NIxvpT4GlyiX3sY9
-xCds6KlBZA3ldv8ltEsCB1W6tDlNG72guZlybGza8bi1CxzzwYSA7WHMQzLT7wND
-LHZ7Oj83gc7b0nQWpMLSilT0lDHefvdQhoV9ymy+EcPpObsI7oWx+axq/M9ycWgM
-UehG0KuRTe1s04iisdI1vn7eMrGEdLQkq8KB5VAYWJYg+Cphscd2QoOVi3uDV8Ag
-9JSRbj8+fzZCq+uJI9z+iin9F65Gm9AknFLREQjFn2y7W5a9dF6kG0EOtivYM5NF
-Cr0CzVpFOL7z329z4FXjEgVr1jZ3sJtp++N1wJSkRf73Zsd8GxcO4gAs1TTRB5zW
-gab5EIDU85cPg8jCA/BvDATVLV4VEqSEO9AvEljCsgJH7vfCmvl95li274zHM3QF
-vfhKE45ZTRGtHR7Yfdcjjc+9CjHXjZWsQIio9+ASJvSBKADrRtm9gxm085nJK2zS
-eq0S0Mldrc4bV8A5DxNiPsWd8auI9jKHieAIi4/8DiJXvqpjihBlD5KZa2VTYWJc
-ECUFogAcmgVctraJ7uJp
-=ZyLn
+iQIcBAEBAgAGBQJOBsrgAAoJEO/kOhxWD91kmS8QAJoRNEb2aq5Grd/Xsz9JN0HX
+VMkrKuuUkopfuuyJsaNoyAT7/3a8+S8nghpJ4iDDirR7tRvXdAPvIMZCLBWMXSDr
+6GfsbaXpSkyekhE/+tk1Ba7TrXmYo8QqcohgboD5Qv3QsQOPJutF1x0XOvEXdb/v
+RTR4ToljgLGYBJLQBRL9c1T6wrdyWjRbbAkshBTeUo885ZMDAR5IfbxA9ga5Qjmi
+j4BvJ2eqYJIXdbmWpiU9Qk5PIT7B9C6kfok9H9pagGSRabuiKfIZHSr/elwu5smm
+dYRa0YVj8acNO1LvAXR43wXgTLHkjb/MM10CU80bTdRvhfwKGGZSTOMpI59Oy7O8
+Pz1k3PXtUVkn/pg2GcNHLgyTGskLtuxt9+qG+mMqEW4bl/bEvbgWHsd1zA/vSrft
+FtHr9KVQhTr8jTIJI7FDS3D4pyaN22esf8xFGgDLeYYbE8NRWWZ/9IrDe06F4LK1
+wM/qqPJVE/r+S2gimqi11nCejDyeXY0By3IM+JSZLYn+qZYAFe0D8ByggV8Synyu
+0gBaV9Lf9y8eFKYpbo4qsY2j72+Ic+TWnB9qvqYEfTSQmxGzM2EjLD6+QqBjPzE5
+Eoqm9wZhjIgd8ieu+f9HEObY1gq/vGm456rRAbvykAEeEznKwEzlv3yhXn0pSdkJ
+2YyfPPPxHzPwOvKyk/Yu
+=yT1g
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/files/firefox-5.0-fix-title.patch b/www-client/firefox/files/firefox-5.0-fix-title.patch
new file mode 100644
index 000000000000..01baa9597498
--- /dev/null
+++ b/www-client/firefox/files/firefox-5.0-fix-title.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/372843
+
+--- mozilla-release/browser/base/Makefile.in
++++ mozilla-release/browser/base/Makefile.in
+@@ -62,7 +62,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+ 
+ DEFINES += \
+ 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+--- mozilla-release/browser/installer/windows/Makefile.in
++++ mozilla-release/browser/installer/windows/Makefile.in
+@@ -51,7 +51,7 @@
+ SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
+ APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt)
+ DEFINES += -DAPP_VERSION=$(APP_VERSION)
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+ DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
+ 
+ INSTALLER_FILES = \
+
diff --git a/www-client/firefox/firefox-5.0.ebuild b/www-client/firefox/firefox-5.0.ebuild
index 0aacdd95647a..f8176cebecde 100644
--- a/www-client/firefox/firefox-5.0.ebuild
+++ b/www-client/firefox/firefox-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0.ebuild,v 1.2 2011/06/25 14:24:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0.ebuild,v 1.3 2011/06/26 05:59:53 nirbheek Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -123,9 +123,11 @@ pkg_setup() {
 	# Avoid PGO profiling problems due to enviroment leakage
 	# These should *always* be cleaned up anyway
 	unset DBUS_SESSION_BUS_ADDRESS \
-		XDG_SESSION_COOKIE \
+		DISPLAY \
 		ORBIT_SOCKETDIR \
-		SESSION_MANAGER
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
 
 	if ! use bindist ; then
 		einfo
@@ -183,6 +185,9 @@ src_prepare() {
 		-i "${S}"/nsprpub/configure{.in,} \
 		|| die
 
+	# https://bugs.gentoo.org/372843
+	epatch "${FILESDIR}/${P}-fix-title.patch"
+
 	eautoreconf
 
 	cd js/src