gentoo resync : 18.11.2019

3 files changed, 2 insertions, 61 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 9cc10c1f5444..5b3c9b2fadd3 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,6 +1,5 @@
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-52.9.0-blessings-TERM.patch 2276 BLAKE2B 2413368995dd8421a634e2a50f4bd9ee01062043a18bef4cd07645ecca05459891ff5aaa294f3abbc85e7ed9515e8936ede8b7faacfb19fadd81ec98ff8080b0 SHA512 08f8d2ba3258b3ef6bda1d2f8ea429e579e1f616dd940f6dc25ef231199d9155b22631f4366908c77ec5b9c4ce63310c9b9e075a6a7a7503b6423e13082f2b91
-AUX firefox-60.9.0-rust-1.38-compat.patch 6208 BLAKE2B 459d451e70fefeaf4bf09b7dd3dc6a7cb5b28b066eac09eaa5ad35abe1a5b6efc8293ac643a5c4d005d9b837590d6a9302495f7b6a6bef5b25b4c20800646ceb SHA512 5c469a7741c3303922c91770e8cd9b474b1f8e3a32e6381ad73c8c8bd302d4c67d8d7675bddb69147311c7aa1c7e4c25a37a2626eb7f82b2d3c72b299ba036fd
 AUX firefox-68.2.0-rust-1.39+.patch 15062 BLAKE2B fdb8b871a57581c092142d167803a68a67dc1b7c8ea04bf2120d531b2a770e12ca5b16778a93ac04a184ca05c515733ded2f55a046c0ccae10ba5c2850cf91c5 SHA512 b19291920587c1833215dea8e55a98bb02199ed471d19f8e16fd3ead74fceeb2a277e7f3d906141a6d2609415d2bff2afd887024671dbc35c93973e8756867ce
 AUX firefox-69.0-lto-gcc-fix.patch 1023 BLAKE2B e70b01fd819c00695f1b5526a7cec85e43ed3d4458d85da67eb46a27044a18552f8de21f43994f46b2873e31021f504564e15c4dd37d63bfaf00680c91af0093 SHA512 3dcb32196e6d9c44ff85a2539e73907196664b2e8c01e1b9bf8f03b614a10c9fd8e76a35369bc7de5479cbb12a54dc5777f3d4c34a0ecf4c095b55bd51599bb1
 AUX firefox-70.0.1-rust-1.39+.patch 10359 BLAKE2B d8e7ca0cc2bc42a7b77cc1e2338ecfcba16888396a316aa35d7f195caa3bef5323456178393a08b030c8b6b6a49d56ad746a672c64dd6d88b1547cb6847c6b36 SHA512 7dfd4441d597a73db7c088774ee7273256b3befcf8ee545e8aee05ced740338a2bb0e58824b44d7f6e8c6ebc094c4f17e4b39a84d4b4e7d4cbef0dc343268600
@@ -290,5 +289,5 @@ DIST firefox-70.0.1-zh-TW.xpi 568302 BLAKE2B ff06766fe46d17e7393e93554901548287b
 DIST firefox-70.0.1.source.tar.xz 326335800 BLAKE2B a7f748719a42f5929150f8a6e9ff6e11d3f92deedc30a1c1f0b6ec7fc3cddc76f7faffc78e0544949599d6142a9fd540cfe467d393c42bcbe9ea027212a937af SHA512 798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-68.2.0.ebuild 24837 BLAKE2B 9c94f39a26ee2b162eca3be61561fc698fc26c38382ed406b6bbcbb472ec184a999679f22082bfe277c47a1eb199f7875714ee36b0fd98254ef39cf47152c38a SHA512 929b7c6a77f97a5930fc0282e3b8e826b30da1d9cd44f0594c70de1ec7dc28993979da8ca56dfdd6db3f28328e6c612b92b910e24632155837d91defcde4c5a4
-EBUILD firefox-70.0.1.ebuild 25685 BLAKE2B 3d14cf7e39867433480ecd44f431752147754d4ffd85007cb949a264eb99e20b3329aec40c9d60ba9d401f9792b06b3f831d90bd8a9e7c6e190de64b74f9f3a1 SHA512 76c1647bc720d27f6f9eed17396504fdd66a0609f6bbba236c3e56c58260580d96f8fb7cd9d90f24728b71a8a2efaecc66cec35901c6f520d1c46a02c669b1d6
+EBUILD firefox-70.0.1.ebuild 25685 BLAKE2B 8e2cce6ac6cccf44c70782a0b5f87c300a7387fc5fc5ac1244523a588dc330419f9ea580998752bde72c01d8036681b9cb34015e7bcd80ca184d4a224cbf524d SHA512 e489569a61ee6eaf41c14c223cf0d87eaa265ff31ac2e7e1ffbfd924650137e0956c4af1823d5af37d39546b60a95846313e8203ad77c5bf22c39184946d3d5b
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch b/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
deleted file mode 100644
index a9183f24e0fc..000000000000
--- a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- firefox-60.9.0/third_party/rust/cssparser/.cargo-checksum.json
-+++ firefox-60.9.0_b/third_party/rust/cssparser/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
-\ No newline at end of file
-+{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"5f36cd1b18562e427222147ca7c971a1a65c32fbbc8bdd00c57c4dd2f5823fa0","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
---- firefox-60.9.0/third_party/rust/cssparser/src/parser.rs
-+++ firefox-60.9.0_b/third_party/rust/cssparser/src/parser.rs
-@@ -555,28 +555,34 @@
-         }
- 
-         let token_start_position = self.input.tokenizer.position();
--        let token;
--        match self.input.cached_token {
--            Some(ref cached_token)
--            if cached_token.start_position == token_start_position => {
--                self.input.tokenizer.reset(&cached_token.end_state);
--                match cached_token.token {
--                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
--                    _ => {}
--                }
--                token = &cached_token.token
-+        let using_cached_token = self
-+            .input
-+            .cached_token
-+            .as_ref()
-+            .map_or(false, |cached_token| {
-+                cached_token.start_position == token_start_position
-+            });
-+        let token = if using_cached_token {
-+            let cached_token = self.input.cached_token.as_ref().unwrap();
-+            self.input.tokenizer.reset(&cached_token.end_state);
-+            match cached_token.token {
-+                Token::Function(ref name) => self.input.tokenizer.see_function(name),
-+                _ => {}
-             }
--            _ => {
--                let new_token = self.input.tokenizer.next()
-+                &cached_token.token
-+            } else {
-+                let new_token = self
-+                    .input
-+                    .tokenizer
-+                    .next()
-                     .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
-                 self.input.cached_token = Some(CachedToken {
-                     token: new_token,
-                     start_position: token_start_position,
-                     end_state: self.input.tokenizer.state(),
-                 });
--                token = self.input.cached_token_ref()
--            }
--        }
-+                self.input.cached_token_ref()
-+            };
- 
-         if let Some(block_type) = BlockType::opening(token) {
-             self.at_start_of = Some(block_type);
diff --git a/www-client/firefox/firefox-70.0.1.ebuild b/www-client/firefox/firefox-70.0.1.ebuild
index 99e92f2e5b2c..7037f224917c 100644
--- a/www-client/firefox/firefox-70.0.1.ebuild
+++ b/www-client/firefox/firefox-70.0.1.ebuild
@@ -103,7 +103,7 @@ CDEPEND="
 		>=media-libs/libaom-1.0.0:=
 	)
 	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-icu? ( >=dev-libs/icu-64.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
 	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )