gentoo resync : 02.03.2018

6 files changed, 707 insertions, 238 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5519f2df35fa..2112fdbfbf53 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,21 +5,20 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1
 AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070
 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
 AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5
-AUX chromium-gcc-r0.patch 2344 BLAKE2B f7fdff3e72e57c222e02a202fffa6785eeb90408094099b8e04cd8cecfc5cd5006801ffaafaa8561a4402ee5fa4bd8b9f489ac6ac3e34c212a683f5793c21124 SHA512 0e29192c8637b050c4976455c798ce0dc078c1e92ec0ed51da71866c2d35242e720f4ca468a431e8ea696700c8ef003a71e8ec06c573bab5355b96e8388a2844
-AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1
 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
 AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a
-AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e8f07382752d7d42b97d970b28a1422773eb297096b61988ebad1daf88a0b36cadb226ee19731e2ad56268c4692 SHA512 d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16
 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
 DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77
-DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
+DIST chromium-64.0.3282.186.tar.xz 482247144 BLAKE2B b59c5afeeed33fe081f35d0ee228a0d67a97fc1370c7d3ab90304ea6e236ee0f7fecd2c36df0acbdf384f42e2f90926cbdd56e683afc95e78d4bdc64b6d24453 SHA512 a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8
 DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418
+DIST chromium-65.0.3325.88.tar.xz 570275184 BLAKE2B a08ae19acfd7a80ae43c0654432588bfa7ea09a0b0f14583cf8e79b3c5997a348bcba12e52002d79214576030574695d32069cbe7037b53dad120aadf6c2a830 SHA512 5166e64f96e5b2bd30b28ed769a8c93b2c1de3eb52c18776222b16758002b6d87ca241bd95c7b37316e1afc5379ff49b77fbf552ab9c0ea868105d66ce400070
 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
-EBUILD chromium-65.0.3315.3.ebuild 20513 BLAKE2B e32383801314add6f6997a26e0a11c091b38f8cc27e4ba974c8ba96a6a01707c67f9118a37204af993a15d3746755f0e504b17afda7a33be2dc98a9a75f33142 SHA512 27c13ce2174e0f0fff75b54946760fdc58976330e9c5ba2e52ccdf9bf5c3c9c8d4577db3246b6e754447af11d08ce7588f1957953920cee96b0e189540ca1ca3
+EBUILD chromium-64.0.3282.186.ebuild 20383 BLAKE2B 8a4d61ebeddca6263a76dde876d9f90238279d095c74b8db75f2cbdacda534289f329d05e1269ec05fbcfc9a9c70a1ac4d453e04902d2f9f6e551e83161eaf65 SHA512 224ddaf94c439efe0e93f3f8f72659b60c8abc25d51277a5b1abe33dda4a7e6197046bf302f11870bc9c5161169f588ff5f58f43e829d665574cd48ab222398e
 EBUILD chromium-65.0.3325.73.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c
+EBUILD chromium-65.0.3325.88.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-64.0.3282.186.ebuild
index c2d2f2fcaf78..1f79ba7bd6fa 100644
--- a/www-client/chromium/chromium-65.0.3315.3.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.186.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
@@ -148,10 +148,9 @@ PATCHES=(
 	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-cups-r0.patch"
 	"${FILESDIR}/chromium-clang-r2.patch"
-	"${FILESDIR}/chromium-gn-r0.patch"
-	"${FILESDIR}/chromium-vulkan-r0.patch"
-	"${FILESDIR}/chromium-gcc-r0.patch"
+	"${FILESDIR}/chromium-angle-r0.patch"
 	"${FILESDIR}/chromium-ffmpeg-r0.patch"
 )
 
@@ -264,8 +263,6 @@ src_prepare() {
 		third_party/leveldatabase
 		third_party/libXNVCtrl
 		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libjingle
 		third_party/libphonenumber
 		third_party/libsecret
@@ -300,7 +297,6 @@ src_prepare() {
 		third_party/protobuf
 		third_party/protobuf/third_party/six
 		third_party/qcms
-		third_party/s2cellid
 		third_party/sfntly
 		third_party/skia
 		third_party/skia/third_party/gif
@@ -323,7 +319,6 @@ src_prepare() {
 		third_party/zlib/google
 		url/third_party/mozilla
 		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
 		v8/third_party/inspector_protocol
 
 		# gyp -> gn leftovers
@@ -390,7 +385,7 @@ src_configure() {
 	myconf_gn+=" enable_nacl=false"
 
 	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_protobuf (bug #525560).
@@ -400,8 +395,6 @@ src_configure() {
 	# libevent: https://bugs.gentoo.org/593458
 	local gn_system_libraries=(
 		flac
-		fontconfig
-		freetype
 		# Need harfbuzz_from_pkgconfig target
 		#harfbuzz-ng
 		libdrm
@@ -434,6 +427,7 @@ src_configure() {
 	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
 	myconf_gn+=" enable_widevine=$(usex widevine true false)"
 	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=false"
 	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
 	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
 	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
@@ -634,8 +628,10 @@ src_install() {
 	doins -r out/Release/locales
 	doins -r out/Release/resources
 
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-65.0.3325.88.ebuild b/www-client/chromium/chromium-65.0.3325.88.ebuild
new file mode 100644
index 000000000000..ede298f25fde
--- /dev/null
+++ b/www-client/chromium/chromium-65.0.3325.88.ebuild
@@ -0,0 +1,694 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_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 ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-gn-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-clang-r3.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	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
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		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
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		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
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=clang
+		CXX=clang++
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# https://bugs.gentoo.org/588596
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch
deleted file mode 100644
index b0aaae8de558..000000000000
--- a/www-client/chromium/files/chromium-gcc-r0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Wed, 10 Jan 2018 15:34:25 +0000
-Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode.
-
-GCC at least fails to compile if the method has the same name of the class. To avoid
-this we rename the getter method to be prefixed with Get.
-
-Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921
-Reviewed-on: https://chromium-review.googlesource.com/857716
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Reviewed-by: Hayato Ito <hayato@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#528322}
----
-
-diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
-index 4f50b7d..d0fa7b1 100644
---- a/third_party/WebKit/Source/core/dom/Element.cpp
-+++ b/third_party/WebKit/Source/core/dom/Element.cpp
-@@ -1276,7 +1276,7 @@
-   return rare_data.EnsureAccessibleNode(this);
- }
- 
--ComputedAccessibleNode* Element::ComputedAccessibleNode() {
-+ComputedAccessibleNode* Element::GetComputedAccessibleNode() {
-   if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled())
-     return nullptr;
- 
-diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
-index 733596b..986e31a 100644
---- a/third_party/WebKit/Source/core/dom/Element.h
-+++ b/third_party/WebKit/Source/core/dom/Element.h
-@@ -295,7 +295,7 @@
-   AccessibleNode* ExistingAccessibleNode() const;
-   AccessibleNode* accessibleNode();
- 
--  ComputedAccessibleNode* ComputedAccessibleNode();
-+  ComputedAccessibleNode* GetComputedAccessibleNode();
- 
-   void DidMoveToNewDocument(Document&) override;
- 
-diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-index 642f55f..f6a8d8e 100644
---- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-@@ -1110,7 +1110,7 @@
-     Element* element) {
-   DCHECK(element);
-   ComputedAccessibleNode* computed_accessible_node =
--      element->ComputedAccessibleNode();
-+      element->GetComputedAccessibleNode();
-   return computed_accessible_node->ComputePromiseProperty(script_state);
- }
- 
diff --git a/www-client/chromium/files/chromium-gcc-u2f.patch b/www-client/chromium/files/chromium-gcc-u2f.patch
deleted file mode 100644
index 20608da58d00..000000000000
--- a/www-client/chromium/files/chromium-gcc-u2f.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee7f5ecc3b869660ded9882a9904cc7c6db7dc0d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Tue, 19 Dec 2017 19:25:00 +0000
-Subject: [PATCH] GCC build: workaround GCC bad "this" handling on lambda by
- not using lambda.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a workaround for the bug in GCC "Inconsistent `this->`
-required when calling member function in a lambda
-capturing `this` through another function"
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274
-
-This fix just replaces the foreach call using lambda with a
-regular C++ for-each-like for (:) construct in u2f discovery.
-
-Change-Id: I9ddf212a7687e02cd7d2d2b43cf76e21dd5dada2
-Reviewed-on: https://chromium-review.googlesource.com/833886
-Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#525104}
----
- device/u2f/u2f_hid_discovery.cc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/device/u2f/u2f_hid_discovery.cc b/device/u2f/u2f_hid_discovery.cc
-index 0695778d2aab..6c4e71179ce7 100644
---- a/device/u2f/u2f_hid_discovery.cc
-+++ b/device/u2f/u2f_hid_discovery.cc
-@@ -55,9 +55,8 @@ void U2fHidDiscovery::DeviceRemoved(
- 
- void U2fHidDiscovery::OnGetDevices(
-     std::vector<device::mojom::HidDeviceInfoPtr> device_infos) {
--  std::for_each(
--      device_infos.begin(), device_infos.end(),
--      [this](auto& device_info) { DeviceAdded(std::move(device_info)); });
-+  for (auto& device_info : device_infos)
-+    DeviceAdded(std::move(device_info));
-   NotifyDiscoveryStarted(true);
- }
- 
--- 
-2.15.1
-
diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch
deleted file mode 100644
index 4553bb766679..000000000000
--- a/www-client/chromium/files/chromium-vulkan-r0.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
-From: Jamie Madill <jmadill@chromium.org>
-Date: Mon, 08 Jan 2018 11:15:38 -0500
-Subject: [PATCH] Vulkan: Allow for no .git directory in build.
-
-The SPIRV-Tools 'external revision generate' script is coded such that
-it assumes a .git folder is present. This causes a problem for the
-tarball build. We can fix this by using the same tooling we use for
-ANGLE's commit id script to check if the .git directory is present
-before running the generator. If it is missing, we insert a hard-coded
-dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD
-to check if the current revision needs updating.
-
-Bug: chromium:799620
-Bug: angleproject:2237
-Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55
-Reviewed-on: https://chromium-review.googlesource.com/854255
-Reviewed-by: Jamie Madill <jmadill@chromium.org>
-Commit-Queue: Jamie Madill <jmadill@chromium.org>
----
-
-diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py
-index bbdb810..57651a5 100644
---- a/third_party/angle/src/commit_id.py
-+++ b/third_party/angle/src/commit_id.py
-@@ -23,6 +23,9 @@
-         print("0")
-     sys.exit(0)
- 
-+if len(sys.argv) < 4 or operation != 'gen':
-+    sys.exit(usage)
-+
- output_file = sys.argv[3]
- commit_id_size = 12
- 
-diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn
-index fe61826..24f5a3a 100644
---- a/third_party/angle/src/vulkan_support/BUILD.gn
-+++ b/third_party/angle/src/vulkan_support/BUILD.gn
-@@ -145,21 +145,40 @@
-   }
- }
- 
--# This could be generalized to a foreach if other revisions are added.
--action("spirv_tools_external_revision_generate") {
--  script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
--  inputs = [
--    "$spirv_tools_dir/.git/HEAD",
--    "$spirv_tools_dir/.git/index",
--  ]
--  outputs = [
--    "$vulkan_gen_dir/spirv_tools_commit_id.h",
--  ]
--  args = [
--    "$raw_spirv_tools_dir",
--    "SPIRV_TOOLS_COMMIT_ID",
--    "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
--  ]
-+spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
-+                                   [
-+                                     "check",
-+                                     raw_spirv_tools_dir,
-+                                   ],
-+                                   "value")
-+
-+spirv_use_commit_id = spirv_git_is_present == 1
-+
-+if (spirv_use_commit_id) {
-+  # This could be generalized to a foreach if other revisions are added.
-+  action("spirv_tools_external_revision_generate") {
-+    script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
-+    inputs = [
-+      "$angle_root/DEPS",
-+    ]
-+    outputs = [
-+      "$vulkan_gen_dir/spirv_tools_commit_id.h",
-+    ]
-+    args = [
-+      "$raw_spirv_tools_dir",
-+      "SPIRV_TOOLS_COMMIT_ID",
-+      "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
-+    ]
-+  }
-+} else {
-+  copy("spirv_tools_external_revision_generate") {
-+    sources = [
-+      "dummy_spirv_tools_commit_id.h",
-+    ]
-+    outputs = [
-+      "$vulkan_gen_dir/spirv_tools_commit_id.h",
-+    ]
-+  }
- }
- 
- config("vulkan_generate_helper_files_config") {
-@@ -864,7 +883,7 @@
-       sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
-     }
-     if (is_linux) {
--      ldflags =  [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
-+      ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
-     }
-   }
- }
-diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
-new file mode 100644
-index 0000000..e1793bd
---- /dev/null
-+++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
-@@ -0,0 +1,10 @@
-+//
-+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+//
-+// This file is a dummy file to enable building SPIRV tools when git is absent.
-+
-+#pragma once
-+
-+#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"