Allow user to modify a few settings locally, bug #465802

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

4 files changed, 31 insertions, 19 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 88b7b1624fdc..9475033a27cd 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.182 2014/03/22 20:17:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.183 2014/03/29 03:04:03 anarchy Exp $
+
+*firefox-bin-28.0-r1 (29 Mar 2014)
+
+  29 Mar 2014;  <anarchy@gentoo.org> +files/all-gentoo-1.js,
+  +firefox-bin-28.0-r1.ebuild, -firefox-bin-28.0.ebuild:
+  Allow user to modify a few settings locally, bug #465802
 
   22 Mar 2014; Agostino Sarubbo <ago@gentoo.org> firefox-bin-24.4.0.ebuild:
   Stable for x86, wrt bug #505072
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 1f9aad261529..da4242b88603 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 10firefox-bin 32 SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69 WHIRLPOOL ad74d82fb1c9c17cc7b7a5a59dd2a27e0fba26c551cc3127066ddda0b9298a37a14bbaf0a3c4c4fce45aed82e7334a0458851c032fcafdc3fb51eca27d550acc
+AUX all-gentoo-1.js 499 SHA256 1a4b4c7de91c063f5b6cc6b64e0b56e295174f4ff00d10b103be6514f632f5fa SHA512 b10788ca38b70fb5b0a76d2ff58d2739c8dbcd5487e9cc0f617c70d4382a19a1d5771b0ac6cf6634901e0ca4f8197dd028c08a81c6397013b574e25b3583786d WHIRLPOOL b374c88411ea55932d2a48689e550a515dcda7fcaef564e5d0a789de9064624b6ebe91bdf51f94208f9bf516f2a926e96c68a438a79c1cb1bb13c37c0e370998
 AUX all-gentoo.js 282 SHA256 96e0361989f2fb457ac757c9c28345ca257ee5628a0ba7ee47c10beaabd3440b SHA512 afe6bb385892bbebef21d13f97e233daf2fdbe0d1772049f443a5b8c19c6d707e5562f0277ccdee5fa9aed68720f7eb062907855a7114cbd2abe58dc2444b607 WHIRLPOOL 8fd6182ecf00d6b31e3c21b1efd5c43add839ecf36498bed6ad7b3ecae5222599cff3b4fc063ddeb829f689fd9e555913f6dc869ac78138468972c62807fff34
 AUX firefox-bin-prefs.js 305 SHA256 786fbfc99425ed9ba32d3e99af6b482226539a86e762197cc10e2b491c7b9d72 SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e WHIRLPOOL e19e8e1d4820b8356103ecd358f2e455ca00f6ed59eba6996a032cf97bcd5d3d1af9624e69eb68dbe3e2d4208e1d14e0355407194d9230098b1a118c213ef97d
 AUX firefox-bin.desktop 330 SHA256 5aa85d89a45e4d6706bc046173ff3be10d7af729b04b88f2378cdbda602b648a SHA512 b1838ba89c756e8af226503989d2689a78874af5575bb25a3184c4d09d3393bf3718e22cf4c03ff0ccb17bc04d4c00e84f5fb5500a4a88f4b921613b11d45491 WHIRLPOOL 5b8ed84befaeb6422e1f6154caf5b928e7fa699d6aea6a32160b60d6d030251fd36f46500b824f8746b39e5cec6b6be42bdfeb01f1a370bae7b85c0f28bc957c
@@ -435,23 +436,17 @@ EBUILD firefox-bin-17.0.10.ebuild 4394 SHA256 433c182d9dca25e35237ff7dbbaa1908f2
 EBUILD firefox-bin-17.0.9.ebuild 4388 SHA256 1df3d23be9a7683f0470300ef19ef835f929e0b44ef650f823c4351747ea2baf SHA512 f3d9d4070c25abf5c253597dbfa7dec69c3b09cea08c06d2b46eeef16ee97f55e1353fca91a6a96903110c9a514dc138ef4e81892ce50ddb4b923e850ec63e00 WHIRLPOOL be001e7741bd723e61f47a738e7001063909b00e6420e56fce4d3c6c59fa7f47ad6fc895702ab9ebd97da6c6caa2592162120322e66a6616c966f1e88bb8dab9
 EBUILD firefox-bin-24.3.0.ebuild 5246 SHA256 9f95f9773cdcbe98d48124c94e6b152fc14ad5bfcf803959052ae91b275511a1 SHA512 0a369aa5a741e6175ec5e50c1ffccd854e085b275d878af56a577a0fa27e938b9033b045ea997132a245ddd1d7a7e290d1364d7653705cf483350346d7f4c468 WHIRLPOOL a35d3d0edff078280b5b0715a9c0014683d9d704f09548b439ff9bd0528c4e462307ec0366196272b5e2f5758b58a2db9f99a595a177976e28a1c8b141855d39
 EBUILD firefox-bin-24.4.0.ebuild 5246 SHA256 57e7eba7639b51aafbcad180bbae23b6a102da3b17f3a496fe5fecd049ebeb72 SHA512 953e09c51cceca79d8fbbd5f7dc46beb4e9c3946c99a36fa5bfdbdd840b5b7a3e33643bb65337b9723fa214c1ead4246baf10f67e6ed6a728af91da94921e122 WHIRLPOOL fdc455e249ea8e36ebe58d1c3a486dd8f34857b5fe5c3081463b1f4b651f221b8a1421b7ff9430d7befdcd436202d49a16d55632eb33b995d4c065ffed5e0eaf
-EBUILD firefox-bin-28.0.ebuild 5083 SHA256 e9947f993d8637774208bace9cd45220dc84294c4447946aee9a2554218425c3 SHA512 d97f92009f4df772d439df5bf8c24d8050ae9652627f4edee6b9852802d6c4e2f0989a762cba805535504bfe73b0046b5ec78fdccc02994f168eb44f2d032824 WHIRLPOOL 6d20429281020d355544955486e0a6b899e85d8f901ff79739d4723db0bb6c368e2e8042668af4aae07f5a016256e927fdfc47d846ba1e7f4febdcca09aeb1db
-MISC ChangeLog 67767 SHA256 6a5073aedb0ba90076a090b7dbcca71874de6d8265b595f04c14eeb822dfc272 SHA512 1fdc56d5e0cc867a7d98b99a5ecdba6280c336ffab40d847f6595c1631db3eafae3b9bb64d1db2a08a00714d1387e64275b3f6ca9bdae57008cfb8858f7e6543 WHIRLPOOL 1bfe179f2477ecba8526d993f168f9b7ccd1ae97ea91ea35a6b83b87ff37d4e2a00ce46b0ffac45daf44e201d754c15ec5369cf907117da715d63cb1b6e5146c
+EBUILD firefox-bin-28.0-r1.ebuild 5155 SHA256 e18095a641f24a202eb11bb359ab73cc3389d76f4405f18ef1873ee628fc9716 SHA512 0edc26391293f6c847a54b026f18dbc157fd31181f116789d63dddab0b445df94819826ee5881c9cdfcee6f1917cbedfba88fb3a1d50684c1d64b33d2de9e229 WHIRLPOOL f62b2a60e7d3021b98c4f31026ff30eb121cb250665eddab7cf899afa517f7d88a0d14e81fdf47e040e8d321c4e18f23f3eb08f072550946b18e7c3ad605b24d
+MISC ChangeLog 67985 SHA256 dd2254771c38d3601fd935ec006e0bcc851f8b90ea7d4116e6ffdb6633faf031 SHA512 e5c2636f053b7e19dbda3b8af04f9640ead6c2c70e6dc06d1740787cb4c4abb3701d472c1706a6e8d3f76c359aec85c387871a742c0974cc771637829c1fe41f WHIRLPOOL e539da7b79d7ecc34ddeff841671e8e4e1086dffe772c90679c5e521f1cb744f48170329ddbc4631df12c25dc773307b1a192b8054d88ea62e3f55c2fef7bf8b
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLe/ZAAoJELp701BxlEWfXuwQAJbD0a1acJ1tGV1qOwaeSdBo
-/2gbl4513Hc3NHIHTZwXQcjfGBaweB8HPfsQpD8knotnJHxfqlH4HP/GAl73AtxZ
-+x7CfE/KBYCu01IsAejRAXG/6S8Q4/ioAT78TJLz3lQPkbjxo6mfrEcdU1eHwsfv
-DDSvTsASCSGUa+lY5H//LEgD+o+ygd+UEUMtkpoOd3aC/tYsO+lPHdAPzgjgkBMJ
-wTcaWebg9vGnSBnzDxCgVeMYDoqA53JIQFyl5egtdwXc7ye77BROldhdhPrh2Oh2
-EaQ8i1FZ0fq689vi7bk4hCe/QFw5m2AL15yOlJBJiZUDhzDmt3kqFtCHtgyWJv3h
-IbF3a0lIaPWes56SWILCxUlC2spJPLSZum119akuQ4gpxlXgzZLIKpXK5jvDYyGm
-QPQRBTVlhd9GbRpckPjp7AtMBaFlCxkXD9SQDUXSLxrpRDntTEjZFI/aOlh02zsy
-kp/Nt+/8m0SaZOHGfncrA0MNLIhZUS6uk83QQEiFJUQGz9Cuy+aOs8IociM25LSe
-KiB+6EJHsSfHhpL+U8DgGfaUARejzB9/QasyxAikNeI2g8uHG934y1GGzhf+sgpO
-KJs4D5cgkdOHJ2lWkha8UjN8aJzWlpulIkXX2hYVoMO5xYTocxDx7WZyZhU84Ukz
-/YdVMQXNKnKG3ct+k9bv
-=s/RB
+iQEcBAEBCAAGBQJTNjf5AAoJEKDMw7q00Ii0g0EH/2vFZ8fOvGHGDbkvJWwRo7CV
+H0jkpThbnLNuSNseSEcH/RsYfRDH58giN2pwAXHmn6tpnAlJfv3IV2kXg0bO/UU5
+IE2bODY1b8VdjZDCbAC31rjVNUFjCZVAsGuf3GBZezefys5rxvTskJakTkeruGRx
+4FYCoxcsmb8Em8c7ifusIXDs1QKJjK3LBh+RToQTstWztVZSFcrKNXh/HL+I+0uz
+YsmDX+CtOMyTRCIaEmfolEPq5GNlJtIFRHITxfUbNEY739NIMpxpA2hdtlNkP07j
+Y/8Ontmi+P82FkpmDoB2GWlyPDV4qOgbIqo5xNfHDioZSH+oA4kMelOtZhDeyXM=
+=89cK
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/files/all-gentoo-1.js b/www-client/firefox-bin/files/all-gentoo-1.js
new file mode 100644
index 000000000000..54e037e566b9
--- /dev/null
+++ b/www-client/firefox-bin/files/all-gentoo-1.js
@@ -0,0 +1,11 @@
+// Ensure preference cann't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+lockPref("intl.locale.matchOS",                true);
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors",  true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell"
+defaultPref("browser.shell.checkDefaultBrowser",  false); 
+// Preferences that should be reset every session
+pref("browser.EULA.override",              true); 
+
diff --git a/www-client/firefox-bin/firefox-bin-28.0.ebuild b/www-client/firefox-bin/firefox-bin-28.0-r1.ebuild
index 1a7b0ec6e1ee..083d9f3a9243 100644
--- a/www-client/firefox-bin/firefox-bin-28.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-28.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-28.0.ebuild,v 1.1 2014/03/19 15:17:39 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-28.0-r1.ebuild,v 1.1 2014/03/29 03:04:03 anarchy Exp $
 
 EAPI="5"
 
@@ -104,8 +104,8 @@ src_install() {
 	# Fix prefs that make no sense for a system-wide install
 	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
 	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}/
-	doins "${FILESDIR}"/all-gentoo.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1.js  "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js
 
 	# Install language packs
 	mozlinguas_src_install