gentoo resync : 10.12.2017

4 files changed, 49 insertions, 47 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 60b1da9eec99..59b80392302e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,20 +9,20 @@ AUX chromium-gn-bootstrap-r17.patch 2896 BLAKE2B 937ac4b7a79d99f2e1c986320e2d31c
 AUX chromium-gn-bootstrap-r22.patch 355 BLAKE2B 8a74d22f93d452e6be173a434d36618326264f648a5567bc0bacbea523ec08fed7b45631c645bef056c9e9d2adf6d1322e319778817adc05dd0abf83fb4f339c SHA512 617b5009f30c7da7a5523cd0be3c1e8c4d8c396401191e0b7dd46126a352a0318ce64947f05557cc94e8a7b5a8cffb3b11265ac1961650f8a3e8541fce2969fd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-math-includes-r0.patch 1206 BLAKE2B 20baae52c881e65ac6ce8ae4c944c2280f0fd21e477a69dccf132ff88227771b590d1956ba2c6168b441b481c5967548681ef3b8d898b3172386b7b7df33e835 SHA512 4a14315fd87ba269e59dda83c9cdf760cff27934974db13bb40f31c8750f4ea6b4b325c7950469278ac82bd67fa770e58a39d712d0b6a75d2befde90b2a267b7
+AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-AUX toolchain/BUILD.gn 799 BLAKE2B c1a088f005100fe77846bde9405ff8e68b65ce8798c4f746609575afdcbefe402e8d10ca55ecc195080752db9c48489ec66aaa658045e32337b9fb599b4d9b36 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d
 DIST chromium-62.0.3202.89.tar.xz 517100784 BLAKE2B c257a554c12bba7b38c85de41e97f900efc43578f3d5a5de5adbb01eebba8ef75c885db3e9c052ce2dabf9bf63b02dbea7b54606cb8d412fb9d5f433d919dee4 SHA512 11ed71d2c9ebf82c9b704111d85d01c5600fc1caeb66e0dfaca172b20bb357817d717b3bcc13f704072b77550fa7fa74f990725b1d7d85d4d2b82cc1baec9578
 DIST chromium-62.0.3202.94.tar.xz 517173548 BLAKE2B 1ec2cadd6581ea14566a0ae9803aecbf176712379a5d56e9f970e7cf5de06d51e2812247c09e96fcfcd3d8f671cead224089479855379be72b591455c76b3c77 SHA512 09e05aec663de94633fb7b658154a5b0146159dea0f434ef412405530274daefc5e554be8120653b840d2b55f5e35202be1a653ece7796d00956df58bc7608ad
 DIST chromium-63.0.3239.70.tar.xz 534258328 BLAKE2B 8e6d846333bfea5e28f04cf2f856a295f0a179bb5d8fa8777d9b4ec8808814b79475a10a4c22dfd7bd606e7cdd99e15a32eb0aae7027a42f4526a05942f6ec85 SHA512 fdc5f433e3520cd053a48dfb107b33da6d844429169047e132663435708ed8fbbabf6949290aca0ff15eecd66fc470c9218bb9fc0376811c7684c8c67fdded6c
 DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444dc5531e7a178a99d04592194158817169f4b9c42769dd76b5df624b5189705b17b9b049f61c2474b411ee520439213f12513 SHA512 049a09a821606ff7f52fa8f41d34f0e67c02a20a346841dfcbb06c4138c60a62240f33d9255662260251e5be913a14b004cb2a12873d2ed34751be2b1efb3f34
-DIST chromium-64.0.3253.3.tar.xz 567976356 BLAKE2B 2dbef0c2b3454b52a39ec03c3af618108e47bbefd63b4e3addbb64d2526778e14299a8597246876d30aed7e37ce8b6e0b227915e2d625202353594a9eb2032d4 SHA512 fd0307337eec5513d73c14a0d8bf494d87e1a658c48585afbf7d0c08314297bf28825ee99bbeab95ccaae8a0e5b1536794c3b4c94f996ba0a4a217cdbc224267
 DIST chromium-64.0.3260.2.tar.xz 568772508 BLAKE2B 8aee43fded3504c5a64b537d8845096a4412353c16ae24b405c10b20b0e49e926bf8db531fa03390cc608c39e5cb09a2b2aab659ceda9320bf8e1f69d75e8bd2 SHA512 f7003976c8c5449569e0017fae5e1f2f7150a297a4bb4ad2a9bafe69e9fb4e931c76efeecbe07cc11a00af5a49591655734f21892e69e3ac523fc4d3faa2795f
+DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28
 EBUILD chromium-62.0.3202.89.ebuild 19510 BLAKE2B 74fd8c4600be29c32c4162d24e0c4c897debb2c0f7a9cbf4e82f368790453b323c98503d2b8350e905bfcaea4764f14bf92985f413fb66765f603ace4b1e746d SHA512 71fb4be5db3cc217630bf2f82ba458038d693981822fef22f104e9f534b332bfea35e2bd72d245c46bb6ce76f816fc13ca8e7cc0426bb1f03d4fa74565b02090
 EBUILD chromium-62.0.3202.94.ebuild 19527 BLAKE2B 7122a171d962f412e36cf6a3f80f32dbdacbbd5bf82286c72dcdb6ec5dd66fef106b4a8890327019cd80a846838524cb4347fa59dfc0d532bcdd5c994e313954 SHA512 c5448d05949604df0ec70df9c54e2de1dff5de78c6c9ed767c32764831e3dacd409e25e6f0659f6892e6209990ee75d0a8bb577efb56f1cbee1d299dd56136b7
 EBUILD chromium-63.0.3239.70.ebuild 19645 BLAKE2B 739645113e8db76042d5f17adceb4a18532ec2ac6257fefed622b81ff66f821a61f86a05610e475da64e5d70025efd5640d58414a529adc6e420693d18155af5 SHA512 ac39dbc3192499f841b8e5d76751ca8eb23629a5d800403e63b433b591af331fd15c7780fbcfae965e2abfdaee86e8f8d5c02bd5d93f2dca07f78b5949f3fdfe
 EBUILD chromium-63.0.3239.84.ebuild 19645 BLAKE2B 739645113e8db76042d5f17adceb4a18532ec2ac6257fefed622b81ff66f821a61f86a05610e475da64e5d70025efd5640d58414a529adc6e420693d18155af5 SHA512 ac39dbc3192499f841b8e5d76751ca8eb23629a5d800403e63b433b591af331fd15c7780fbcfae965e2abfdaee86e8f8d5c02bd5d93f2dca07f78b5949f3fdfe
-EBUILD chromium-64.0.3253.3.ebuild 19700 BLAKE2B cb9b2af06a817395bb5d33d83749d361322a80f87a2d69abc6fa53a865e6fea8add855a9465d7de271212044e06447b59f8aaa33d8b19e2100518ab653b0b04c SHA512 a3f47e18189e30a7c01a3a6208e3f980ef574a23b11c0003054a1a293e720ca135180f4fe4bea826bbfbf2f628042b17be0d0221cd0ac80706d31ba5a94ab26a
 EBUILD chromium-64.0.3260.2.ebuild 19829 BLAKE2B 209b41ee2417d3f324d177f386aa58590a71bc50d811dee41f5abdf1fbbf65f538b015ddd2ecf8745e6ae75db455c85d7d4772b3880b60ed1da13cbc29d1345c SHA512 525faa08400e3849ac733de0e9d84b85044130e7ad042c483253aca60304db2c6a1019de5c1d403af233aaa6007aef6a43801a2a20c6c305ccf0c60b4cd87ecd
+EBUILD chromium-64.0.3282.14.ebuild 19762 BLAKE2B cf69327a7ce62d6d4db177b36e9329d69251fbb9f6da8e7dcb4cb4bea56311e49cbe652768c9fd5eb7834d5c954d2ff7f59b369155900c3f7710b6b3176dec3b SHA512 af5d3532b829c201c63d4fcfa3e23b7822789cd2a98775ff88963b99b3d1047a6419783f77e17e299b18d624325ce8fc1eb44804b7d38ee5f92fb711d5febd20
 MISC metadata.xml 1336 BLAKE2B 77878a208aff8c9744fca1874e9f692dc6dd55484303274012288c01def548cb96e0d428125613c84f49966adae9702c430ff1ca61c7df5654d1fda4ac9aa22d SHA512 028de2d2f3068ec95dc586b1d5b40cc4f69feba6ca685038427c606005ffc1ede58d056b0502822be83e28217182adc5305e81a7de8fd49f3162250a476cc1a0
diff --git a/www-client/chromium/chromium-64.0.3253.3.ebuild b/www-client/chromium/chromium-64.0.3282.14.ebuild
index 3961a106c128..a03199f21308 100644
--- a/www-client/chromium/chromium-64.0.3253.3.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.14.ebuild
@@ -145,9 +145,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-widevine-r1.patch"
 	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-math-includes-r0.patch"
-	"${FILESDIR}/chromium-${PV}-gpu_lists_version.h.patch"
-	"${FILESDIR}/chromium-gcc5-r5.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
 )
 
 pre_build_checks() {
@@ -184,13 +182,13 @@ pkg_pretend() {
 pkg_setup() {
 	pre_build_checks
 
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
 	chromium_suid_sandbox_check_kernel_config
 }
 
 src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -220,6 +218,7 @@ src_prepare() {
 		third_party/angle/src/third_party/trace_event
 		third_party/blink
 		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
 		third_party/breakpad
 		third_party/breakpad/breakpad/src/third_party/curl
 		third_party/brotli
@@ -235,7 +234,6 @@ src_prepare() {
 		third_party/catapult/tracing/third_party/oboe
 		third_party/catapult/tracing/third_party/pako
 		third_party/ced
-		third_party/cld_2
 		third_party/cld_3
 		third_party/crc32c
 		third_party/cros_system_api
@@ -360,6 +358,9 @@ bootstrap_gn() {
 }
 
 src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
 	local myconf_gn=""
 
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
@@ -539,6 +540,9 @@ src_configure() {
 }
 
 src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
 	local ninja_targets="chrome chromedriver"
 	if use suid; then
 		ninja_targets+=" chrome_sandbox"
diff --git a/www-client/chromium/files/chromium-memcpy-r0.patch b/www-client/chromium/files/chromium-memcpy-r0.patch
new file mode 100644
index 000000000000..dd2fd57d26a6
--- /dev/null
+++ b/www-client/chromium/files/chromium-memcpy-r0.patch
@@ -0,0 +1,35 @@
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Thu, 7 Dec 2017 22:33:34 +0000
+Subject: [PATCH] memcpy used without including string.h
+
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
+memcpy without including string.h.
+
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
+Reviewed-on: https://chromium-review.googlesource.com/813737
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: vmpstr <vmpstr@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#522579}
+---
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
+index 9e4660c685ee..95ad50b1a338 100644
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+ 
++#include <string.h>
++
+ namespace cc {
+ 
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+-- 
+2.15.1
+
diff --git a/www-client/chromium/files/toolchain/BUILD.gn b/www-client/chromium/files/toolchain/BUILD.gn
deleted file mode 100644
index f88d3afdcfda..000000000000
--- a/www-client/chromium/files/toolchain/BUILD.gn
+++ /dev/null
@@ -1,37 +0,0 @@
-import("//build/toolchain/gcc_toolchain.gni")
-
-gcc_toolchain("default") {
-  cc = getenv("CC")
-  cxx = getenv("CXX")
-  ar = getenv("AR")
-  nm = getenv("NM")
-  ld = cxx
-
-  extra_cflags = getenv("CFLAGS")
-  extra_cppflags = getenv("CPPFLAGS")
-  extra_cxxflags = getenv("CXXFLAGS")
-  extra_ldflags = getenv("LDFLAGS")
-
-  toolchain_args = {
-    current_cpu = current_cpu
-    current_os = current_os
-  }
-}
-
-gcc_toolchain("host") {
-  cc = getenv("BUILD_CC")
-  cxx = getenv("BUILD_CXX")
-  ar = getenv("BUILD_AR")
-  nm = getenv("BUILD_NM")
-  ld = cxx
-
-  extra_cflags = getenv("BUILD_CFLAGS")
-  extra_cppflags = getenv("BUILD_CPPFLAGS")
-  extra_cxxflags = getenv("BUILD_CXXFLAGS")
-  extra_ldflags = getenv("BUILD_LDFLAGS")
-
-  toolchain_args = {
-    current_cpu = current_cpu
-    current_os = current_os
-  }
-}