www-client/chromium: dev channel bump (60.0.3100.0)

Package-Manager: Portage-2.3.5, Repoman-2.3.1

5 files changed, 63 insertions, 23 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c1e8751e8949..8cbccce538c4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-58.0.3029.81.tar.xz 509252204 SHA256 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb SHA512 49e8a641e6fe839880ac4cc17aa4b79875dbd0e14adcf7ad0138730334555fd57c93c1e7ebdf6f03c61528c351a5a489f56fb7d7809aef268627b186c547a4f3 WHIRLPOOL eed9d97cd4cb4d9a56864e65e797f6d126327d6e9371bdfe416fd57f0f4c9c83f37e125798a1753b5d8bc5921036bdfe064b3d7e94c3ba315a710241a6c5b179
 DIST chromium-59.0.3071.36.tar.xz 531792008 SHA256 1c62e16d47969897c1dda97e12c14646d3504dd191c6175d92c1fde57ac1a79a SHA512 c97d599f37fbdf9b6966861b2b1b016c68bfdd702bb9967152dee374500f9ca9b3eb6fe4bb00640c71c0217257b7912c6b7bc8b8b0713685282b3708643e2b7e WHIRLPOOL cdf10735423c04a54685abd8d8c210b4999691a86b4fc826c30f190e69a12e32edb83ccbe1e6bf173d76d6638b587acd9b85deec27ca912d69fb2e3a53a41b2b
 DIST chromium-59.0.3071.47.tar.xz 531847280 SHA256 d431b463e8a6c194d5b5dbee0c664aec8d1d87a2cc17b4237eca2b37d3698ab5 SHA512 98a608248ee9948cf34e9e5cbeb735515354cbfd869b5a773dda6c25d3351b1a7c289a85c0fb0f37340a4f54e02f8b38e54e14455eb58a6a7040596e0d7c50cf WHIRLPOOL f136b13c97ce1589f8acd26c45cd9fc21d68960532b52c9826e44dbff6e9d1350bc0bf5f63e0b9a205e409b6c381ca3f5762b826db928555ca424664e7bdfe45
-DIST chromium-60.0.3088.3.tar.xz 530979712 SHA256 f47aa0f8a3a1280f1df548a31a0560f32f205716bbd4b72866c101a78842fc1f SHA512 a80684d8b941fe6c91cd3b9d558f1a8b6a61ee1292424d5c2ca67d8e8b46df2291d4f95f40d02e393a83ea0f3e3f99274e8a86473e8c1c7702ace50ad26e79f9 WHIRLPOOL 227045a6c130ddd12b0bef00e7886e8435cb58e988e02a6320f0ba32f8c78203de88ad31df0fc2ef80e9c5f88449513e5fd6fd6279dd360070c94830038a6859
 DIST chromium-60.0.3095.5.tar.xz 532742216 SHA256 6835717ae34e0722dee36a5a633dea10a6dd31ebba1748031981c08a46a27d16 SHA512 be9a3edd3c3b3d72e0bf443cdcd93eb160b5016b783167c8545999cab536eb644ab86e4cb71e49d7fbcb7037024962e0e18bd94a843cf0b978d2ad86ffa17dbe WHIRLPOOL 4851cb67ef8e3584b313d9f66afb2678c7b481c779e8aded8ca6e1b7fee2ada4e167f3316a86dd478c48968236708b120e9a35650767fd8d046b6691e306f564
+DIST chromium-60.0.3100.0.tar.xz 533255016 SHA256 5e03a5a9146bc1efefe3246d79eef9341a12429fb54e952633e2a62e374ad944 SHA512 ba795ec89c0f7bad7a27d5c7917081ec526f4ae0379b3cd993fc94c2feb2b75eb93d6ad8b1eb2925ebc68ff400dc5ec8bb94b795d02894a969cfb7fd91868685 WHIRLPOOL 9c7ccde4fb0aadc7f626e162af8d0c4752d075c50c163dc19679a8d747bf7d3aba3f7907f4b2592c01b0bbfd251e30e5be1aa77c12598e0c3ed4603111aa888f
diff --git a/www-client/chromium/chromium-60.0.3088.3.ebuild b/www-client/chromium/chromium-60.0.3100.0.ebuild
index c9e354dbb807..b9dfc469075f 100644
--- a/www-client/chromium/chromium-60.0.3088.3.ebuild
+++ b/www-client/chromium/chromium-60.0.3100.0.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -185,11 +185,12 @@ pkg_setup() {
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-widevine-r1.patch"
-		"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
+		"${FILESDIR}/${PN}-FORTIFY_SOURCE-r1.patch"
 		"${FILESDIR}/skia-avx2.patch"
 		"${FILESDIR}/${PN}-system-ffmpeg-r6.patch"
-		"${FILESDIR}/${PN}-gn-bootstrap-r6.patch"
 		"${FILESDIR}/${PN}-system-opus-r1.patch"
+		"${FILESDIR}/${PN}-system-libpng-r1.patch"
+		"${FILESDIR}/${PN}-system-libwebp-r1.patch"
 	)
 
 	default
@@ -247,6 +248,7 @@ src_prepare() {
 		third_party/google_input_tools
 		third_party/google_input_tools/third_party/closure_library
 		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
 		third_party/hunspell
 		third_party/iccjpeg
 		third_party/inspector_protocol
@@ -261,7 +263,6 @@ src_prepare() {
 		third_party/libsecret
 		third_party/libsrtp
 		third_party/libudev
-		third_party/libusb
 		third_party/libwebm
 		third_party/libxml
 		third_party/libyuv
@@ -301,6 +302,7 @@ src_prepare() {
 		third_party/swiftshader
 		third_party/swiftshader/third_party/llvm-subzero
 		third_party/swiftshader/third_party/pnacl-subzero
+		third_party/swiftshader/third_party/subzero
 		third_party/tcmalloc
 		third_party/usrsctp
 		third_party/vulkan
@@ -353,7 +355,6 @@ src_configure() {
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: xml (bug #616818).
 	# TODO: use_system_protobuf (bug #525560).
 	# TODO: use_system_ssl (http://crbug.com/58087).
@@ -511,23 +512,6 @@ src_configure() {
 	out/Release/gn gen --args="${myconf_gn}" out/Release || die
 }
 
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
 src_compile() {
 	local ninja_targets="chrome chromedriver"
 	if use suid; then
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
new file mode 100644
index 000000000000..cda19bb92398
--- /dev/null
+++ b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
@@ -0,0 +1,29 @@
+Drop _FORTIFY_SOURCE=2 from defines
+
+Gentoo toolchains enable this by default. Removing this prevents spammy
+warnings about the macro being redefined.
+
+--- a/build/config/compiler/BUILD.gn.orig	2017-05-17 08:37:23.147973304 +0000
++++ b/build/config/compiler/BUILD.gn	2017-05-17 08:37:44.448414953 +0000
+@@ -1161,21 +1161,6 @@
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer &&
+-        (!is_linux || !is_clang || is_official_build) &&
+-        current_cpu != "s390x" && current_cpu != "s390" &&
+-        current_cpu != "ppc64" && current_cpu != "ppc64") {
+-      # _FORTIFY_SOURCE isn't really supported by Clang now, see
+-      # http://llvm.org/bugs/show_bug.cgi?id=16821.
+-      # It seems to work fine with Ubuntu 12 headers though, so use it in
+-      # official builds.
+-      #
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac || is_ios) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
diff --git a/www-client/chromium/files/chromium-system-libpng-r1.patch b/www-client/chromium/files/chromium-system-libpng-r1.patch
new file mode 100644
index 000000000000..7c329c71f7d2
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-libpng-r1.patch
@@ -0,0 +1,18 @@
+--- a/build/linux/unbundle/libpng.gn.orig	2017-05-17 09:57:24.487799547 +0000
++++ b/build/linux/unbundle/libpng.gn	2017-05-17 09:57:47.680282784 +0000
+@@ -5,7 +5,7 @@
+ import("//build/config/linux/pkg_config.gni")
+ import("//build/shim_headers.gni")
+ 
+-pkg_config("system_libpng") {
++pkg_config("libpng_config") {
+   packages = [ "libpng" ]
+ }
+ 
+@@ -21,5 +21,5 @@
+   deps = [
+     ":libpng_shim",
+   ]
+-  public_configs = [ ":system_libpng" ]
++  public_configs = [ ":libpng_config" ]
+ }
diff --git a/www-client/chromium/files/chromium-system-libwebp-r1.patch b/www-client/chromium/files/chromium-system-libwebp-r1.patch
new file mode 100644
index 000000000000..cf8beabea24c
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-libwebp-r1.patch
@@ -0,0 +1,9 @@
+--- a/build/linux/unbundle/libwebp.gn.orig	2017-05-17 10:12:50.147089090 +0000
++++ b/build/linux/unbundle/libwebp.gn	2017-05-17 10:13:02.763351884 +0000
+@@ -6,5 +6,6 @@
+   libs = [
+     "webp",
+     "webpdemux",
++    "webpmux",
+   ]
+ }