gentoo resync : 14.07.2018

3 files changed, 31 insertions, 2 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 59426afed141..8e646b1a6ceb 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,5 @@
 AUX bug_1461221.patch 1077 BLAKE2B f492faaef59b3c3a83132ad552ebe21d93ca1afb521f0a1d8d347fe2a92831a2df3e48d7ac148b62f7f594f6f21831d91102d7d35ccff89b2a3fb31725b855b2 SHA512 f2a69e6e2c5d08f09fbc6bbe88fd26bc80a5fe38efd46bbcfcb88a33745ec184c602d1125d79020f948c3919c1830ee5a3afbe95dd378e5985a76ab4c73c4889
+AUX firefox-61.0-mozHunspell.patch 884 BLAKE2B 5c7da7e893b21744d991de2713f2f7d1d8840077d88cb51c9000295e8816cd476f16b98f8fdafd7ca99b35eba16a6b45436367440678b488a723da522486228d SHA512 db72555f1e24e768723343f49dc0662e3f2dd41b29ee55028b8dce8affab821e68a943e3fbc27176b2992f65e4da1d3028c49f1327e50f435a99a2f37049c69f
 AUX gentoo-default-prefs.js-1 821 BLAKE2B 2af9a9e9f3a71fae918a4098397e931c02df5a8021d0bc87ebc4981076674aba99d88c5b8acf2380c915e92ad07a7636891ea8a07cfc850e9c4d15e58d0cd276 SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2
 AUX gentoo-default-prefs.js-2 880 BLAKE2B 5a40aabaf6678b3c73f06adffebac3ebc9908da02e55250dc6a544f6dcda1b738d6e6f45dd84d08ad14f733fc313d7b2852160cc1a95ad290010f75d2d1286bd SHA512 d03da4b9692b5b71aa2a170093cff2e4f8e5e32e314f918b5aaeb5a07c3b5edf52e096ac60830ec54a0dfe50834218c899c262176c0719f81aa68b475bbeb87a
 AUX gentoo-hwaccel-prefs.js-1 100 BLAKE2B 08be790b58524077a5681cc06e10890b72dc6e8155c9e03e6ef9165035087d4b8cbcac4a6b8997f61db3721895c9247a12171eec7d082fa15e1d5312bf51fbee SHA512 cf5385c793056e66b8853fd641dce2e7804d6878675afd24485487f2201801e1bdd5d27c15cb0d483eb34bfb75e7a21c01f1bbf701cb1c2dfa48f8f6422ed42c
@@ -470,5 +471,5 @@ EBUILD firefox-52.6.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc20
 EBUILD firefox-52.8.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b
 EBUILD firefox-52.9.0.ebuild 12941 BLAKE2B ee69c10083377e91ef76a31680994325b7ec0fde2e2f8702a51f540cd85a6d598ddc5b45286b31bd61dc0e9215a9deab19ca92bdd99f87e4c80083eaa916612a SHA512 9cdf9c6ef0f52b3b4732e7bfb2ab841077c17e5cd918abf50e4dea7064aa8eff1f8018f5be3659bd7ab9628d7b0335e7222d86350af9c96362e0ebc85a58fe33
 EBUILD firefox-60.1.0.ebuild 11769 BLAKE2B 56eb54c81ddffc9e422f82131db355fb77dd72d9d50d9dd92030a0c8e4b22b84599d7f2d35292a5753bbbaec9ed8d67b3802c3f9ef9f220246a3385cc4ad80b9 SHA512 9f2da4ed851bb2e16c1c0b2210b2ff14507e9f99e07fb073b65174b3041abeb957231a9eae6e354fcd4d8869c25df437482d75832d60023366c37f79fdfc2d0d
-EBUILD firefox-61.0.ebuild 11540 BLAKE2B c48cabe96a770ed0ad29441923c6e8263241c9e870643066b2dab5303599281daaa74cf2fc098afad6003df600ce57d0f6559462180b7dfc2cb3ee1fe178b9d3 SHA512 440545f805a6c59ba5b0c175640b190aebbf78da57d37baf9d010ab839226976cc5c9c729018f36aead51d26d645dde38bdea8b88cdedf298707dd1b3a9a6136
+EBUILD firefox-61.0-r1.ebuild 11707 BLAKE2B dffa2142ba326aa936a21c1eee04a9de03e04ba37942dd98660686562a1ec37984d37ba0048ae726651263f6f561fb190476a26db098e03f8e5997d1ce93b472 SHA512 3c1ae1b241495c960022fb58b8944aa12eef151b090abfe7fe9e77ec461a6a9817006220d84383f31e14c57156fbd9423f44ee7045119647dd202592314467c5
 MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2
diff --git a/www-client/firefox/files/firefox-61.0-mozHunspell.patch b/www-client/firefox/files/firefox-61.0-mozHunspell.patch
new file mode 100644
index 000000000000..2002bd1da50d
--- /dev/null
+++ b/www-client/firefox/files/firefox-61.0-mozHunspell.patch
@@ -0,0 +1,25 @@
+From 5bdc1dc7a4541338b13096ae52627ceecd0cca9e Mon Sep 17 00:00:00 2001
+From: nvinson234@gmail.com
+Date: Sun, 8 Jul 2018 16:52:04 -0500
+Subject: [PATCH] Add missing include of nsCOMPtr.h, bug #660726
+
+Signed-off-by: nvinson234@gmail.com
+---
+ extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
+index dc33fdfb3..415e00973 100644
+--- a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
++++ b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
+@@ -13,6 +13,7 @@
+ #include "mozilla/ResultExtensions.h"
+ #include "nsIInputStream.h"
+ #include "nsReadLine.h"
++#include "nsCOMPtr.h"
+ 
+ // Note: This class name and lack of namespacing terrible, but are necessary
+ // for Hunspell compatibility.
+-- 
+2.18.0
+
diff --git a/www-client/firefox/firefox-61.0.ebuild b/www-client/firefox/firefox-61.0-r1.ebuild
index e3945abf8ec5..1d65fc4e1f81 100644
--- a/www-client/firefox/firefox-61.0.ebuild
+++ b/www-client/firefox/firefox-61.0-r1.ebuild
@@ -125,6 +125,7 @@ src_prepare() {
 	eapply "${WORKDIR}/firefox"
 
 	eapply "${FILESDIR}/bug_1461221.patch"
+	eapply "${FILESDIR}/${PN}-61.0-mozHunspell.patch"
 
 	# Enable gnomebreakpad
 	if use debug ; then
@@ -220,8 +221,10 @@ src_configure() {
 	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
 	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
 
-	# Default mozilla_five_home no longer valid option
+	# Default mozilla_five_home, system-hunspell no longer valid option
 	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+	sed '/enable-system-hunspell/d' -i "${S}"/.mozconfig
+	sed '/disable-stylo/d' -i "${S}"/.mozconfig
 
 	# Finalize and report settings
 	mozconfig_final