gentoo resync : 10.03.2018

4 files changed, 26 insertions, 2 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bf7234c3f241..c674a5405db4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,6 +5,7 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1
 AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070
 AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0
 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
+AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a
 AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5
 AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
@@ -21,6 +22,6 @@ DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41
 DIST chromium-66.0.3355.0.tar.xz 582642152 BLAKE2B 16a89cc99984b566741770f9081a738596ac0b031e916073df417ac42406a96a8f874278720f3462fba827218dff141eddd614cf2ca494ec3d38577744e7c441 SHA512 324902e3e8ec7c22dbb95f2d8f97069dac97f702f528130c06eb7a246e495e51b069f4ce09a7ca875ff511e0bf992207b55b1f887aaa3a438179618c206df436
 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
 EBUILD chromium-64.0.3282.186.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
-EBUILD chromium-65.0.3325.146.ebuild 20857 BLAKE2B b81cb7ecf903bd45ab8d73525cc44a2c2df73f556b219da09f0c15228bb3e643a5ebedf04aa7aecbf1f5e000c72f2349e6c0aa8e665417eb08532333e1d8d965 SHA512 d0b579df26079e450df39d4ae50995b8cd2e4359203c352cfe35e13f837e265e71af01eebafe8331237247d1c32c82ffd2cd28ce86e76f79ec2475f723ea258e
-EBUILD chromium-66.0.3355.0.ebuild 21037 BLAKE2B a94ffccec8d31d6e495fd72864b93f8004f969c6c156de432ed9d9011c9fe6df849c4de9bf555063d2d47d021e42e8bb510bf6c983bdb42edbe2e1733d2b5aea SHA512 0d474c45afe1695ebf464c7aed5640ce8a7b4bc50a49dc1d04b5f972908839bba82e0439cbf2de15e3af3c8a4c9cac89a92192287b80135106ce324630f6a8c0
+EBUILD chromium-65.0.3325.146.ebuild 20900 BLAKE2B d93ddc7aa2b11928b47fb508950642f89b4f0b94bb6f6ad6e516cdce42e68b7346cd6095337632e8a15d946d1da6af10be36ac0b23766d04b02fe78de5747a3c SHA512 06453fef8284858d4273f20c30142cc78fd2d047ffb4b9a4444ef93caee07918eb0d6f4b64c95ad71a20228ee561d1256c7b7a9c66e2e49dfeecbeeed5ea4b02
+EBUILD chromium-66.0.3355.0.ebuild 21080 BLAKE2B 00612a5d736a8b06719079cc21dd5c34dc78876c1481a429cc87cc83c0548af9abcb28a67aa74c19f49da2b4ae07dc81cfde78462c3927278e96ebfe27c60f3b SHA512 85277baa3ed4f287798228ce0ed554ba90f92ea7a2d464358ff8fad88da17be6bd8de4a718b90c9121f775431141ad6ba4edb3624ddaedc78e21206ecd5813b5
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-65.0.3325.146.ebuild b/www-client/chromium/chromium-65.0.3325.146.ebuild
index 11bbb4b77805..3ca4d45a0ba9 100644
--- a/www-client/chromium/chromium-65.0.3325.146.ebuild
+++ b/www-client/chromium/chromium-65.0.3325.146.ebuild
@@ -154,6 +154,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-clang-r3.patch"
 	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ffmpeg-clang.patch"
 )
 
 pre_build_checks() {
diff --git a/www-client/chromium/chromium-66.0.3355.0.ebuild b/www-client/chromium/chromium-66.0.3355.0.ebuild
index 4c8e080b09ee..72c8738a74f3 100644
--- a/www-client/chromium/chromium-66.0.3355.0.ebuild
+++ b/www-client/chromium/chromium-66.0.3355.0.ebuild
@@ -154,6 +154,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-stdint.patch"
 	"${FILESDIR}/chromium-clang-r4.patch"
 	"${FILESDIR}/chromium-ffmpeg-r1.patch"
+	"${FILESDIR}/chromium-ffmpeg-clang.patch"
 )
 
 pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-ffmpeg-clang.patch b/www-client/chromium/files/chromium-ffmpeg-clang.patch
new file mode 100644
index 000000000000..6c5ac71323b4
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-clang.patch
@@ -0,0 +1,21 @@
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -639,18 +639,8 @@
+   if 'win' not in target_os:
+     configure_flags['Common'].extend([
+         '--enable-pic',
+-        '--cc=clang',
+-        '--cxx=clang++',
+-        '--ld=clang',
+     ])
+ 
+-    # Clang Linux will use the first 'ld' it finds on the path, which will
+-    # typically be the system one, so explicitly configure use of Clang's
+-    # ld.lld, to ensure that things like cross-compilation and LTO work.
+-    # This does not work for arm64, ia32 and is always used on mac.
+-    if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
+-      configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
+-
+   # Should be run on Mac.
+   if target_os == 'mac':
+     if host_os != 'mac':