gentoo resync : 22.01.2019

4 files changed, 24 insertions, 23 deletions

diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 515e9e48c1f6..179248119f7e 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,5 +1,6 @@
 AUX 10firefox-bin 32 BLAKE2B cd6d8dd86d0c8ec95d468b10faf65a7076dc1946f13e719f34092a15e095d6800d92b162e6370c32f1b0f0326fc50ab5bb324c849234bda61d80a705c9d09fb5 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69
 AUX all-gentoo-1.js 500 BLAKE2B 2860ee21769b18b4c6dfcd4e5ff3a09aa5ffab60c9f7745a0c86c5d158a80fe6fc4c4e27959916eb3fa2ab2bd591c7669f1a6266048b949ec93b7a20ae8da840 SHA512 bc6e9fb408d81e03455f96a426cbc1a2a653e732eb8759e7d577b7eadbe27b211bcea483babd81b58e66e06afe371697263b372dc45faeb5b87da78d687c37be
+AUX all-gentoo-2.js 472 BLAKE2B 0600a8ed7fb5dbadaa6c897db41af18410a75201dcc0e7db51d6ce0b9cb96dfd28322f41853fc2c7d5af72cde7f50fa6acacbe37a306fcf4d43e9689381211b8 SHA512 f2331dcf2825533d7032bb687e7aa43046a08dbd79974b24055a969958efcd03c400c2ca0038ea29be42955e06288e44f61146aa627896230b0879e076a9fc31
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-bin-prefs.js 305 BLAKE2B 864d8545cbff81d9a1a7d615d3a244c9060c646abf0fbf4d09fad2c9dd2b312d0fedb97b0fae7efb60def0e5494069d12a8e9e6d1d638744d77535eef8ac4fcd SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e
 AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd310f3f82de2b0fe07412d9768f6be2f467e3e315d89f501b1fe2cc319ffa92f072f4fa6cf6e2af4c2d20 SHA512 409ec95a1ee449e2a0a915358fb9c8c3e4bcec8026cb503f1b7dcd815bda9ff5745158ed01cc190c9a0adf5b4e9d644efe5ee3e0232bd8419324c1b6600c863f
@@ -263,6 +264,6 @@ DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf02
 DIST firefox-bin_x86_64-60.4.0.tar.bz2 53244850 BLAKE2B 73e576e7bf40fb2a08781a6060315220be2219f01cd89f6a15bc07749cdd7e62c7a908dd05487751f023c34ac9743a545ebd171679007bff32df4f60bc7d4663 SHA512 a68277c61c6452f95b8a2c470e8204874df8238cae6035c31c79a0ceb18835b5d7960b93ad1316fb0a963525b0297909252e4376c4f6a42c80dbc1e5beb24c17
 DIST firefox-bin_x86_64-64.0.2.tar.bz2 59315788 BLAKE2B b5a7aa38f47aba3cf2361c635605f2486fb594c8f4222aa104785ad3ba43297e60a29fb8b4ec53406c9ce3f2ec01d65cbfc26e4aa04e1103210e0880f81faf1f SHA512 d6fce66e5f58fddb695c6acad01963d71bd19ac543daefc35cef499abc49ee690d2e5067c3dcdb43e0cec62676d4df9f8ef8e683fc9953325e2bf52a2c27e92c
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
-EBUILD firefox-bin-60.4.0.ebuild 5610 BLAKE2B 08e8524832d193ea938897244cd3124497300359e60d7e2cdd666c64d149aebce1937ae7d2f98f9fd29a09ea45ed595e86767d43d857e611ef03dc8e95a2a3a5 SHA512 554a444f08d0fd1871fb55153641ddf20383ea79e8bd1e6ba7071db3337a2d3c2abf55d1846f36d430359bab86ea7783e9ade02008b608d23bd8650d39039b06
-EBUILD firefox-bin-64.0.2.ebuild 5610 BLAKE2B 3bd8c48638fed3f25382136e6bd83f5592b26ff47957a5fe985fd43ab689a6c6bb464e92f0825a6fd1cfa497dd87ff0f5b4f57a43f7b7c5cf0e754d84d610659 SHA512 6d62c8748cf00373d549ad82d7a556bb02fd4ad8a66f55d960508efee720a6a2c6b8c02a31441fd97c6185e4a40a3c1bc6df10596a41727bcf6d137ba4a865c1
+EBUILD firefox-bin-60.4.0-r1.ebuild 5381 BLAKE2B a83d9422f9edf5d18401746e24ca114025024721a87b7ee7b62605593189ec5104f7e938ecd6dc1529b285705278d481b9f43f08b31539db4b1308531c14090e SHA512 5d6851b82b4272afbaae0d16e2d76d405178988d6f0af55c30b68a88829274459133be8c6af71fff92d48516ddc4d37ffb4d2593b0172d88b52e164f842de5ac
+EBUILD firefox-bin-64.0.2-r1.ebuild 5381 BLAKE2B 64c73a62f6470a8be7e278a99eaecb086897e98932e90f660c69cc96d9d9178cf6981e1e3016fe5a44c9bfef4fd8a5e00a05e0218230fb6bee0ff85c0646b372 SHA512 2d9f7a895aa2753b3abf023cedbfab4556cc2ecff7d4e43a8c5e2a952f15288f731e17389227755289301fdfc555f4be50880dd969e99b5c56e5d97a6cb8ad91
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/files/all-gentoo-2.js b/www-client/firefox-bin/files/all-gentoo-2.js
new file mode 100644
index 000000000000..29e34ca753ad
--- /dev/null
+++ b/www-client/firefox-bin/files/all-gentoo-2.js
@@ -0,0 +1,12 @@
+// Ensure preference can't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+
+// 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);
+defaultPref("intl.locale.requested", "");
+
+// Preferences that should be reset every session
+pref("browser.EULA.override", true);
diff --git a/www-client/firefox-bin/firefox-bin-60.4.0.ebuild b/www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild
index 371ab74243bd..ebbc9c131293 100644
--- a/www-client/firefox-bin/firefox-bin-60.4.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -123,18 +123,12 @@ src_install() {
 	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
 	doins "${FILESDIR}"/local-settings.js
 	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
 
 	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
 
 	# Create /usr/bin/firefox-bin
 	dodir /usr/bin/
diff --git a/www-client/firefox-bin/firefox-bin-64.0.2.ebuild b/www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild
index 0fbbe4c781d9..0567f8c5f39f 100644
--- a/www-client/firefox-bin/firefox-bin-64.0.2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild
@@ -123,18 +123,12 @@ src_install() {
 	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
 	doins "${FILESDIR}"/local-settings.js
 	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
 
 	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
 
 	# Create /usr/bin/firefox-bin
 	dodir /usr/bin/