Fix default gentoo preferences

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 24 insertions, 4 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index c963c8eb3881..06c899892bde 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2011/03/26 13:50:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.54 2011/03/27 14:25:27 anarchy Exp $
+
+*firefox-4.0-r2 (27 Mar 2011)
+
+  27 Mar 2011; Jory A. Pratt <anarchy@gentoo.org> -firefox-4.0-r1.ebuild,
+  +firefox-4.0-r2.ebuild, +files/fix-preferences-gentoo.patch:
+  Fix default gentoo preferences
 
   26 Mar 2011; Brent Baude <ranger@gentoo.org> firefox-3.6.16.ebuild:
   Marking firefox-3.6.16 ppc64 and ppc for bug 360055
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 21dae734a6d3..7da29c362e4d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,6 +3,7 @@ AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862
 AUX firefox-3.0-solaris64.patch 416 RMD160 f59eaf44b797715d6116f0f151803ec6c26587c1 SHA1 c6cbd37cc2f20a1bdc347b33ff8cdd8b9e159424 SHA256 5d2f04928d820460b099a0baa92ed2d681d75b5634c21364997be216214f5597
 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
 AUX fix_blocklist_support.patch 3194 RMD160 87254cfdbd7fae1ed5704ecfff4ad5c691b44dba SHA1 3da1bb6544bb1b07548faa1b94bbe9fd7350dcb6 SHA256 4e0de29d5dc65b3bd9a5bb7ad1adee92056af78da66c5c1c7153dec3026931f3
 AUX gentoo-default-prefs.js 598 RMD160 9ee952b88ebee3b47f6466e2d19674805d8529d2 SHA1 980bc21282021b8be5c420155d2126c86b174068 SHA256 ad533b62fcc7e0ebbafe039e74db68734c86077178b03d37a01868cf790c42f9
 AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
@@ -314,6 +315,6 @@ DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f82
 EBUILD firefox-3.6.12.ebuild 9526 RMD160 09c1fbad806f8cc977bdfcf35e5661731dd8e63c SHA1 cf1b4648f7f1708c0fb33fa8ae4e2566ac73fdea SHA256 b9dbe985567f8f3e7051f73e4978e35f03e439b688eaf73c71a8a8cece7ad163
 EBUILD firefox-3.6.15.ebuild 9471 RMD160 28ae7119357771cd66d645fb833fdd5c5bba1e88 SHA1 3322fe983218f239627d1601686d6620afa70b3b SHA256 e35251d0f927bd21d63bdd9147e767d4bfc0795d499f243f74ac1d1ba5c8dc0d
 EBUILD firefox-3.6.16.ebuild 9475 RMD160 d2bb739cd4cbe5080d72de1f72c6872c5bfb6921 SHA1 45544dfd4777cb922ae5af0ada6486216db7da33 SHA256 bdec9acbff994098b7b853ce3066ea83f5e62a28d41545b670bdcc7896baf1ed
-EBUILD firefox-4.0-r1.ebuild 7886 RMD160 840e9281ab94140f6bafaabf3e2189755511fe7e SHA1 575b9bb6df6e02b855888b8ecd47079d8f0b4058 SHA256 aec4e4763ca88dea42781888441b3c393da2ac6421ba1bf5ea0de28c7e334770
-MISC ChangeLog 125149 RMD160 bbe82153c064a0f4f5d00e657d7b7172d094d1f1 SHA1 1edd676d21b6d52c5a990d2b572fda6c7ab58c1f SHA256 74f8b7892245bbe47a3a5ab66712f09ab8d5f2c8a54c9b09251a01e6ca8eaf84
+EBUILD firefox-4.0-r2.ebuild 7984 RMD160 5c6b7658752532dc9e9d03386c47e607942487a1 SHA1 82c7b0d10e32441d6e6c80b3bb252b04f32eec8e SHA256 ac15bcb1994dc885cd660258ed9c5903c7a758f3853d8526f7225f8b8491df9d
+MISC ChangeLog 125352 RMD160 0494c28ee98e7164e37391713a8be9d831ad6de2 SHA1 c0573f0b489b85f73814465c5ef7bb8ed87a4df7 SHA256 5108a303ddad2a0f7bb59bb21be483771888f3cd823034ebab0a65a5c6d07735
 MISC metadata.xml 591 RMD160 4e13e501ffacdd9001cbc15bc92e3e901463454b SHA1 9ddb97472d099fb3f65193bc7cbfcbb26e6281dc SHA256 e91f4670e55c264903dbbd321565e1d817e510dfabadaa81c9e15c7317864b23
diff --git a/www-client/firefox/files/fix-preferences-gentoo.patch b/www-client/firefox/files/fix-preferences-gentoo.patch
new file mode 100644
index 000000000000..a8ba90fb9f10
--- /dev/null
+++ b/www-client/firefox/files/fix-preferences-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/browser/installer/package-manifest.in	2011-03-24 23:01:23.543000001 -0500
++++ b/browser/installer/package-manifest.in	2011-03-24 23:02:01.927000001 -0500
+@@ -444,6 +444,7 @@
+ 
+ ; [Default Preferences]
+ ; All the pref files must be part of base to prevent migration bugs
++@BINPATH@/@PREF_DIR@/all-gentoo.js
+ @BINPATH@/@PREF_DIR@/firefox.js
+ @BINPATH@/@PREF_DIR@/firefox-branding.js
+ @BINPATH@/@PREF_DIR@/channel-prefs.js
diff --git a/www-client/firefox/firefox-4.0-r1.ebuild b/www-client/firefox/firefox-4.0-r2.ebuild
index 7ace0af9df6b..3c94f2e9bf1f 100644
--- a/www-client/firefox/firefox-4.0-r1.ebuild
+++ b/www-client/firefox/firefox-4.0-r2.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-4.0-r1.ebuild,v 1.1 2011/03/23 00:45:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0-r2.ebuild,v 1.1 2011/03/27 14:25:27 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -136,6 +136,9 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	# Ensure are preferences are added to omnijar
+	epatch "${FILESDIR}/fix-preferences-gentoo.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user