Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

19 files changed, 32 insertions, 911 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9560717dcca2..2fed175fae3c 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2884b3adbcd7..594b63fed4d3 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,12 +4,10 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1
 AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0
 AUX chromium-compiler-r0.patch 5681 BLAKE2B d56abb6f816cfb530e583b5e59c7719f766ed0ce198f1caf3043cde38115fabb8f776f57946abf57f7430259ac0bb7c7c44602198d9a5e1f3ac942c4f1da366f SHA512 01a799b1ae1dd4042fffb0307207089c99d568289e20677ff7436767da9ee16cc6491f759d0b7447b59b53d44cbd235053078aa7dfdfcbc66eb9cd2d73ab8857
 AUX chromium-compiler-r1.patch 5859 BLAKE2B 6a96e586c0f38e949544d8d5a756b92a08107ea41de3c62d1c8c38173c67ae8c08a2b9207947b78048ca0dd7d731c60c2ac34a7e72facc340ff876cd42f91d0e SHA512 01303f0d134edeb1bac5a1c2e95b7e66997b218fcd8af8aa53860a48d0f4adff000b90a9e12a55eb11dbb163ac4f1926e010b194a6d9b75b62598040c6fcbfb0
-AUX chromium-compiler-r2.patch 5649 BLAKE2B 211945cbb207e956517470210d97b2dbbf6c496f71cacda7f2fa288e5ba631a791a0e60214e982d4f91c4db723dd5c4aaa2e9f51423d2e63fce8b334687170f8 SHA512 563017b56d410080ae3bee8053cb65f0308d841b96222cb6ea7e444cfd066dbd8c6161489240c778de63794ada76c90189fd794001d4fe50ab875251c0b7f41f
 AUX chromium-ffmpeg-build-r0.patch 8657 BLAKE2B 08bddd7f6ca4379ec2fddeda91a1bb709a4be1c26dd869e1e21ac2576cede1c28531b0ad40bc8a6abb74212fa9cf2dbe1c05bb20cf0b9730918c71bda47c0779 SHA512 5014564446305d9e594de8bf51483a29b25c7e2f8d4bb858419669bdaae5ba60cef55c8e0d2b4236a58b2be0f8762bd588089b6face98e763e6e5f8f78801f17
 AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a
 AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-gn-bootstrap-r23.patch 1943 BLAKE2B ca68059bf799dcc8fdd7ab698008e55a2c5707168c72b463ffd66a73f97df8ff5689fa5d440d60b519ac3ed6739a1b95ce5ed8f294e473d065a7bb2a35bb4267 SHA512 0af208a257ff3ce3f61b242e05ee4988a371c3d9ee5c686fdc15b023283b1914272c4e30562a48c294fa47f665b5082e274f44f871c97afc6c849b6065f9deec
-AUX chromium-gn-bootstrap-r24.patch 1206 BLAKE2B 1c7ae7581d8ec37f1e00846a4059018141d58784c5bc41ef5b45924f30ffaeb4911b534c47a437b29818c4908c8b3a9a7ec751515c567d665511ca3f9ecb0115 SHA512 1dbfb22841b201587d0c09a4bccfd390d5383c9183f83078384f1e96267a3e186cbe6285c8ef632c366d110cdd445ad1491d590e9d036c024da57b07ad0259b0
 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
@@ -20,14 +18,12 @@ AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-66.0.3359.170.tar.xz 583956312 BLAKE2B 313ac8c785147e940ead222aeb30181af3c5848bdc7e706bf83a42078c63ce71431a7d17ad4937a6a37cc72beb67725ead790f489a1d31c70a9a94a2e73a9c45 SHA512 69c78975c517d6d59225c92968c1be879e3a2ca2a3671f38a5f8b6303719f6bc441b1d1fe0b19818ab7f9a06cd15bf8631d03ad4931da6fdc641ba2894eecad2
 DIST chromium-66.0.3359.181.tar.xz 583985908 BLAKE2B 22794b379591da9e4bfb1ea38aec2f53e88584079ef8d0e56434d65b2f86bddf37ac41a82b9e94ae41700f10ce8b7a8bfe2c794ffe63ce9d04b2704bfe2a209d SHA512 3549cae27ce33a19bab857c91da1ed96c1ae36123b71bdf41a8bbacdc9554d15b4902e835dc4a8ef8016e69344b809aab4e1e3b1b26bd54d5ca651048bcb9886
-DIST chromium-67.0.3396.56.tar.xz 589901992 BLAKE2B e5207de67db589d65dbaf7af493308a60e3951993f439218c025d10fecd331052a3dfd0f196f3c7e078cda79af3d248a94550a6ffb8c0da7842592e48de20313 SHA512 a7397ebcff54e184ad510fcc7d7958a4adafcf53c88a7ad951fc361366439b01c4e1a77dfcfadbf1f96d92e9ea503287862e7cd2521be696919cf3ee0f1d0816
-DIST chromium-67.0.3396.62.tar.xz 591452000 BLAKE2B 01d63d21548fcfc707e3ab1d293f24f34237784ec87949e2886a364d7e8f517f82e98803f45b690111a31304d269917442305d04fa13c34180f852007280a78c SHA512 c768701a04600f6dd981ea036a28973df104281dcdadda20d0ae515a0b80112b94840cee36823676c4b4cd71e0e6ef069af801f746fea29d65f978a3666f6cb0
+DIST chromium-67.0.3396.30.tar.xz 589816436 BLAKE2B 05f2d9c1119f5819793e343c485d49296b0e6b852bb49aef7558c8f492ed62db29e30957d7f299aef45eae3ea8a292c526975141abd843524e776ffe20d716e9 SHA512 c1ce45d899f34a1ee492ee4176a23aceefc3aaeacbe36effda7616c6cfe40187102b07763267295d07d862c6dba0210e03db7447320dd02b4cc95b52ac6e6ac0
+DIST chromium-67.0.3396.40.tar.xz 589878296 BLAKE2B e02d8980cb882fb67eb6e048dfa8534fb423259af257040cdda8198aac9433a221d6218873a8e5623ae3cfb8e081f22bfc40444e53be38b17a0ebff77537263d SHA512 1d4986d444076a4a48bf9ad7061dbb424f520e46f2f58f8f84dfee2fefea05a3b019ef27acda553efb9a75db9731acbc0c80f5dfb39a9137e9e27336306d5981
 DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8
-DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2
 EBUILD chromium-66.0.3359.170.ebuild 21079 BLAKE2B ad63d299090512b44fe6d1deccb754a9c3471abeb4cdb013c5e2b4743d500cfb3a3434ee842310c5b5e1a3145028b98a112ecbf0f31004cf1966aeb92a1a16a8 SHA512 17d7f7856cfbe4b9006e153d312b43c43ffccb9c1c5f2e9f4f920eefccc83000f29177028319597bae453148a6c8c255695694345b289ef5b6da2842abe4e4c6
 EBUILD chromium-66.0.3359.181.ebuild 21080 BLAKE2B 886abfd8535cf3069938bd5c7e048b0bf27b08c451e9225e514ba63b7d4181a7febbacdcaf8540f8db683aff6903027ca09644de1fba6a4ffc9e0dd70d27d998 SHA512 d054f5fc67cc2e538c7d9136e07214f203d76e88afe23b9defbe269cb17173f6eee5336f7552818221f4c57bf21545c359611156da07df4aa71307db41a4c025
-EBUILD chromium-67.0.3396.56.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
-EBUILD chromium-67.0.3396.62.ebuild 20537 BLAKE2B 6809ea94380318ef07058c7d390f8962f8471e9cb98ad3d203fc2cd828bd0ce45abb7daab0a35318ee3436633c07c6a347050685eb5a85c186815d7a04c9d256 SHA512 e030897bc36c313c6c999d67e1a9958e5223b04399fcfa1762d1253d710c613fe2bd4223a67c3ab8848b26748dd187718c304cf1299d9af43c134e142bbc0d4b
+EBUILD chromium-67.0.3396.30.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
+EBUILD chromium-67.0.3396.40.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
 EBUILD chromium-68.0.3409.2.ebuild 21128 BLAKE2B c0b3f816629ad411e9a1173d8613b56b265ac2d64c314d0ffcc146e6692ab3a997cc4390658ed8f8926bad36be480a907ad7c0f455d90be445277c56a28622bf SHA512 619db1868802d4857193c91531539084a40177dabc3b622bdedf35f1b3e5a48c751c8a106d19035dc3d6da86e003a2d9a74d936c30cb5c3225b827c39784018a
-EBUILD chromium-68.0.3438.3.ebuild 20521 BLAKE2B 394bd409a05510ab68f7d6fd959d873c9b5c0270f7fa1cd60a5cef4486d5609a5a44eb787806dbefd150d78c358d51c72025d2703094bb84ef7673ab0e9443fe SHA512 d63e83a360ed95917f0f6f5c4c39c25698eaea5c9d832b0bb187e6aaacc5cdd492ad0bc990a29f846f21f3eb93b414417e680ff4e3822bf563249a3e6053da93
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-67.0.3396.56.ebuild b/www-client/chromium/chromium-67.0.3396.30.ebuild
index 773792ab8f90..773792ab8f90 100644
--- a/www-client/chromium/chromium-67.0.3396.56.ebuild
+++ b/www-client/chromium/chromium-67.0.3396.30.ebuild
diff --git a/www-client/chromium/chromium-67.0.3396.62.ebuild b/www-client/chromium/chromium-67.0.3396.40.ebuild
index 537d5b482647..773792ab8f90 100644
--- a/www-client/chromium/chromium-67.0.3396.62.ebuild
+++ b/www-client/chromium/chromium-67.0.3396.40.ebuild
@@ -104,8 +104,22 @@ DEPEND="${COMMON_DEPEND}
 	>=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
@@ -225,10 +239,7 @@ src_prepare() {
 		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/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
 		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
 		third_party/catapult/tracing/third_party/d3
 		third_party/catapult/tracing/third_party/gl-matrix
 		third_party/catapult/tracing/third_party/jszip
@@ -299,7 +310,6 @@ src_prepare() {
 		third_party/qcms
 		third_party/s2cellid
 		third_party/sfntly
-		third_party/simplejson
 		third_party/skia
 		third_party/skia/third_party/gif
 		third_party/skia/third_party/vulkan
diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3438.3.ebuild
deleted file mode 100644
index eb64c40b42e9..000000000000
--- a/www-client/chromium/chromium-68.0.3438.3.ebuild
+++ /dev/null
@@ -1,686 +0,0 @@
-# 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 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 ~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-4:=
-		|| (
-			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
-"
-
-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/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-r2.patch"
-	"${FILESDIR}/chromium-compiler-r2.patch"
-	#"${FILESDIR}/chromium-ffmpeg-build-r0.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-math.h-r0.patch"
-	"${FILESDIR}/chromium-stdint.patch"
-	"${FILESDIR}/chromium-ffmpeg-r1.patch"
-	"${FILESDIR}/chromium-gn-bootstrap-r24.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
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/http2
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/spdy
-		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/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		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/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		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/crashpad
-		third_party/crashpad/crashpad/third_party/zlib
-		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/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		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/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/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/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		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/unrar
-		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/antlr4
-		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=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	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
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/
-
-	#if ! use system-ffmpeg; then
-	if false; 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
-
-	# 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
-
-	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-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch
deleted file mode 100644
index 3ac2eb81f4cb..000000000000
--- a/www-client/chromium/files/chromium-compiler-r2.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 83337d52e4b9..f2c192fc31ca 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -228,8 +228,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-   ]
- 
-@@ -488,18 +486,6 @@ config("compiler") {
-     }
-   }
- 
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1415,10 +1401,6 @@ config("default_warnings") {
- 
-         # TODO(hans): https://crbug.com/766891
-         "-Wno-null-pointer-arithmetic",
--
--        # Ignore warnings about MSVC optimization pragmas.
--        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--        "-Wno-ignored-pragma-optimize",
-       ]
-     } else if (use_xcode_clang) {
-       cflags += [
-@@ -1462,22 +1444,6 @@ config("chromium_code") {
-       "__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" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # _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" ]
-@@ -1807,7 +1773,8 @@ config("default_stack_frames") {
- }
- 
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1841,7 +1808,8 @@ config("optimize") {
- }
- 
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -1888,7 +1857,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1935,7 +1905,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1973,7 +1944,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2057,7 +2029,8 @@ config("afdo") {
- #   configs += [ "//build/config/compiler:symbols" ]
- 
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2155,7 +2128,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   if (is_win) {
-     # Linker symbols for backtraces only.
-     cflags = []
-@@ -2186,7 +2160,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
deleted file mode 100644
index 0577dd4cf73b..000000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Thu, 24 May 2018 22:39:20 +0000
-Subject: [PATCH] Fix gn bootstrap
-
-R=dpranke
-
-Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44
-Reviewed-on: https://chromium-review.googlesource.com/1072740
-Reviewed-by: Dirk Pranke <dpranke@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#561663}
----
- tools/gn/bootstrap/bootstrap.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 0d5f42a1d4a8..300abacdbca0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain):
-       'base/trace_event/memory_peak_detector.cc',
-       'base/trace_event/memory_usage_estimator.cc',
-       'base/trace_event/process_memory_dump.cc',
--      'base/trace_event/sharded_allocation_register.cc',
-       'base/trace_event/trace_buffer.cc',
-       'base/trace_event/trace_config.cc',
-       'base/trace_event/trace_config_category_filter.cc',
--- 
-2.17.0
-
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 34a9ada15bf8..f1595d23334a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_67.0.3396.62-1_amd64.deb 53717682 BLAKE2B 4b9e81029a1941625e4b8d1201d4fdc01c73c2b5cffb9c78faba8a0d3e70985a1c4571153ee291dc8c9f3743d78fa0f12d8342482cca6440712dfa72bf4b7619 SHA512 040694582940e776f74fc8644eeb04f3cb3016be246b385c20870f10dc6bef2278469f135eb83f9329a9a14fbdcba8ef99430c98b83e6af9326fed397f30a519
-EBUILD google-chrome-beta-67.0.3396.62.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_67.0.3396.56-1_amd64.deb 53717138 BLAKE2B 2298fda12ae312089552429afa5ba5800947d4a76e2c859224fb424e96a9a25a930ef89995adb1b0c2377a33f6c56dfecf6033f663d89bd9f932539505269268 SHA512 8d28a562a21251fffdfef6aa6e2e5eb69be4e24a722d312aac6baf5c1246fee1f092b4765ddc2def20e598e39b8ebfc8cbcbf470fd546a54a06d09917eb87ddb
+EBUILD google-chrome-beta-67.0.3396.56.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.62.ebuild b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.56.ebuild
index 500479b752d3..500479b752d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.62.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.56.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 4bfbb22db2f7..ba87f75d8feb 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_68.0.3440.7-1_amd64.deb 55550866 BLAKE2B 27bac60cb261aaadca187e35857f39be13a89dfaab5889a4af8c63139e02c6740c5c36621fc68ffd60de69e5e7db18ff8fdbef5aac62b911b6cc5c1d383b9feb SHA512 31ac59aa77546cc80e49f0f18a8e37ad43316b2192df1225459ebef855c27755c4323656911909b153e71538754967ea0437c1d580957788a483c82db2d2c52a
-EBUILD google-chrome-unstable-68.0.3440.7.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_68.0.3438.3-1_amd64.deb 55563070 BLAKE2B c3376710747d52d24b1f9c9ad37c292479a52a78a9149958615069074b8e067ea5e8c6facc3e3bee84ad3b3191f98aeaae91a9f431adfcfdeebdf6aca6b75c84 SHA512 c68cdff1a34098418b65302c190e775c999f592bec10b996361f887d38fc54afad026e1055204f1acb453ab479d51f93c8acbfb50e1497eca7c524fdde6ccdd8
+EBUILD google-chrome-unstable-68.0.3438.3.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.7.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3438.3.ebuild
index 43d5352b4dd5..43d5352b4dd5 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.7.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3438.3.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 2b1bb4af6d8c..2dd7cbc42660 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_67.0.3396.62-1_amd64.deb 52532020 BLAKE2B 6b0a9aae756dbc7dafcd1e1479a0ac9f630c7c888549c54bef6f295d9649812bab4471e4c3e4716aec729d2d83d75e501f01b2ca7fb63399f7c113af761ac1f2 SHA512 78e27742d9f9568b3c3aae2e46052466a2386b772fb04f8a55bb38cf030cc8c24561b5c3d7670d8bbdc56d7f9e43986122dc4035a0607836ebfcdcd454597c86
-EBUILD google-chrome-67.0.3396.62.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
+DIST google-chrome-stable_66.0.3359.181-1_amd64.deb 52336026 BLAKE2B ff6d8646970c11734c0bb692e5174ecad70094356d0929e24763b23bf4cd03fbe7cbb7a64b8188b55395708e4d505782b8e3879bdfa7b0e2f8a66e76fe27d276 SHA512 95c0d47e8017072f8bfbfd7a46d46677e8729791bdc48fddb3d966574702a167dcde7557e317048bfa93d9216e613385244353f7fa94b8b793d384fb09427c93
+EBUILD google-chrome-66.0.3359.181.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-67.0.3396.62.ebuild b/www-client/google-chrome/google-chrome-66.0.3359.181.ebuild
index 38dbe68c340a..38dbe68c340a 100644
--- a/www-client/google-chrome/google-chrome-67.0.3396.62.ebuild
+++ b/www-client/google-chrome/google-chrome-66.0.3359.181.ebuild
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index be1b00b78cea..efd51d15b0f1 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -3,5 +3,5 @@ AUX lynx-2.8.8_p1-parallel.patch 2112 BLAKE2B 8bba1efae94cf7e55eccdb00692c0a7e3a
 DIST lynx2.8.9dev.11.tar.bz2 2665470 BLAKE2B 3fa28252ff619bc7d82d4e1460b7407b6f2f40bb111b8b54ce478327a023748c51e45dbd8e0ae74daff24d59fc3b6a5776a78057c846b8f3bbb153b4c4b92f17 SHA512 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50
 DIST lynx2.8.9dev.16.tar.bz2 2674662 BLAKE2B 3771199e4d74dcc38c15b8b75207810d3a4f3afabb76d5d8dc7dcd33c5dd0119f0f28a1a719f54df7ed0ecdfb972942c6439536486f99a685febbc252127cc3f SHA512 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518
 EBUILD lynx-2.8.9_pre11.ebuild 2474 BLAKE2B 55f353231ff7bc0551a6fec2c77e14f448db280842ad2e255479323422d3386c854067807c6df9b4bdb78511ab82637d65e1f250a6c1aaf6d9812abd884b7263 SHA512 9a343cbe5f5bc0350eaaf347e92415b9227877302bda4267f5e9ccb3e0cc4f694e043b6b5d2615b383c1aa474125b75e4d6e91483b4fbf4429fc9db72aa28db8
-EBUILD lynx-2.8.9_pre16.ebuild 2592 BLAKE2B 6f0ff94dac5d8a2aaa5f818a23c628cc1524e6098b6caee87fa00f95a4143ee8e994bd0337a3af9555e8a177df42c0784a0411f311d2e30e93f65e7a786f55c8 SHA512 5ac9771018f79b88569d53f02da10b55cc0198f09523eae9ae3840bffca556dad06049d9dbd4d0e55503961d7fd0f2bc804d2b61aab23754f0d1b7a95e1e9993
+EBUILD lynx-2.8.9_pre16.ebuild 2593 BLAKE2B 68ca701129df998ff8f294fb1aab72a552fc224596ddbfaed8c83ed48370a9893579cd6d4023f825302d728c896bb4ed84f19107bb1a76ba34b35ea2ccc92b2d SHA512 b36f77406ee82d2ad0c9b59292e52710905b44f57a5a3b1c1f7c917fce0b1699549588203f328d054c82bd6019584e6af064d9e142ff1a30b13c5311cc5c987e
 MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac
diff --git a/www-client/lynx/lynx-2.8.9_pre16.ebuild b/www-client/lynx/lynx-2.8.9_pre16.ebuild
index 4e5d6677b336..eba754b694d1 100644
--- a/www-client/lynx/lynx-2.8.9_pre16.ebuild
+++ b/www-client/lynx/lynx-2.8.9_pre16.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 9bcd17549acc..9cf760994b2f 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
+DIST qutebrowser-1.2.1.tar.gz 3626806 BLAKE2B 462c1ed29a4a1cbf16af6996bf2201e6d1d693ba0afa4d0abc3f231ace0388ab134a6dc052cbe393e3945e0e8a068ac232ee61a3a1f94f09f31fb7d8267ec901 SHA512 798eef2efe74fbe1bbd1b93f8f36645a98be37fc74f23349acc62c21f5a317f44df1767d915caf5a18c92444b19c3b6ce9fb3b9ecaf52bb2af2fe2ee36049f5f
 DIST qutebrowser-1.3.0.tar.gz 3659104 BLAKE2B b4d7cb1ea24adad10c49babd61a7189baaae5f362304128046a3cc580748b2c23ddf03cf9902515b577e36de7b105edd23a75a78559ec5a27ec4e924bdcb08f2 SHA512 4c696aa21e848c02ec2718619c314e51104995ebec81ec7a7ddb5224643dbf3ef0487cbfd7cc3aaebcbf583c1cbc6ae6e2824645138d64c1d2e5eddbce830f1c
-DIST qutebrowser-1.3.1.tar.gz 3533949 BLAKE2B 49055673406acf89f76132c256105e898d7fe3fad797bc919407df4a6174445b459dd74946d7fa9532b301f6421e16e98e947bb407c2d940a753d803ee57dedb SHA512 59cba56a8d0d2813c679841ad835c2badbbde6b27d623288ed4d81e869b52dceaabddd3cb8560b9b7785bdf5759ad841f3c717235d1698d995b19a63333cbb18
+EBUILD qutebrowser-1.2.1.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
 EBUILD qutebrowser-1.3.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-1.3.1.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
 EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.3.1.ebuild b/www-client/qutebrowser/qutebrowser-1.2.1.ebuild
index e7535337c44e..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.3.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.2.1.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 4d4fbbd543dc..78495a92a57f 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9
+DIST vivaldi-snapshot-1.16.1177.5_p1-amd64.deb 54064562 BLAKE2B c30afb6c6a15d6558aa1479a0a114329359cd9e1ca80de25498917e8bc6cc2478998cb969cb8937ef6509afc5f790a8d58c7596f55cb91a5ba4f59f2a0831c49 SHA512 76d68038f3fd8a45e5cea88513a67af0cce7a9b8971203027b8490d1fc9f0b64ee0c3659ebffbc693e25876cd83d9b2afd74c10f24e8bae1a2ef7a315882ca4b
+DIST vivaldi-snapshot-1.16.1177.5_p1-armhf.deb 47810656 BLAKE2B c43609c45cb2281e09ad2251e44025da3d18d9fd06d50d3f13eb10417782d7f2463c12035f6aa0b618910e4cb76cb662b47b22202d6b6889acdc70c0589124b8 SHA512 eaf900cb88d1b207d7d799c6818bfa679921864aab0df85676df694be26b9b8f9f9439c72a653366df8f4249d926c6aa8828dbd67bd0417ed394b4aa82fdd7c5
+DIST vivaldi-snapshot-1.16.1177.5_p1-i386.deb 53642380 BLAKE2B 60e0e162a45174b1360d443c24b39d2ce4e182e83b2fe0b8c269067a93a34cb6d92f95a5523a57ede26c30007a155fa2283307e38ae3b32ad26536da8949890b SHA512 7a99da24cf7198a7d875c9b242349e0f9f3c548b8ff277dcc30f66c9cc75ec29f8d1e2d6abd275f3478bfcf826fb9695fa3f65d167153582d0b9557fb19d53fd
 DIST vivaldi-snapshot-1.16.1183.3_p1-amd64.deb 54115912 BLAKE2B 4da1e44a5ae612cd9e42c536380f20d865ab03341eadee88c7d64013ff78503ef592314f4ffef6a64e9242c78b85199066f5c9cbeefa814b86a8115d61792676 SHA512 0bb313cdc5c0f800f29bcc5d2a1b528310968b4d311b943afa37961f4664ff0f280097fe1150301bc546e6252bc8d1f9828aa88f8fff40242910786757e93e3b
 DIST vivaldi-snapshot-1.16.1183.3_p1-armhf.deb 47836516 BLAKE2B cf15ad84f1b2ba6730b7a225fe19be96880764134b63f2fae78d18a4ff0c201ab35d303fcf25e48b76ead281ebda8a8771fb74b1c27a8eb1de2f5a089839e1a4 SHA512 7d954a9826a466b56e77a508a7655010e70c500bd76e47c5218c3da7de199a70677c0af0967261c5c32a2ed4a76a0038f63ec8e2cd38518344c7d74839c7f5ec
 DIST vivaldi-snapshot-1.16.1183.3_p1-i386.deb 53694006 BLAKE2B 6ccea2dd2f6c538587df05ebb42121c8a11c9e3eb55fc18747e80ee122f1eee16989bc375f53e718e7b29681172e6f77df9031997ec10e3ebe14833be872bd60 SHA512 488f256d3dd9ca44f9553a2a6409707e4f526f9c97b4a8c2eaf1a039ebffd7e9d850a4762edaadfebc75f6074e33432e8d0d418747b3ceb561520e2ac6b73c5c
-DIST vivaldi-snapshot-1.16.1195.3_p1-amd64.deb 53983692 BLAKE2B 35d73cdb4f4a7e12adb8c42b27af1a1d04002463747038a5296f1299c7928d88af6875137582f1bdd62dfb53804d9257da27a645d327fb13cd2f8e436a2f07ea SHA512 771fdf4c6c6aa05d3b2a3d533e7b819da6f1a906d5658597bedb4b0fd4d0f17cbc5d72bbe3abf2b59efeedca5d232db38d99dd06b7086e5c31359d34d33e3452
-DIST vivaldi-snapshot-1.16.1195.3_p1-armhf.deb 47756024 BLAKE2B 51e9c4796d6d6e8ac1493e0ba9ddb7749f01bfc13dcd77cc07620b97431d2c5e13bb899315098ffbc40ad4036c7a3ee4d48d2e049c75ed2e5510b1107dc37f41 SHA512 202d1c9a3e8910c66229e549bebe9c33787b254aba7e9dcf8f6c2ca3deb7c58235580b9b7fd72dc7923b7b94170359a2ba5c60e89dc5299a6408712b2a904432
-DIST vivaldi-snapshot-1.16.1195.3_p1-i386.deb 53584334 BLAKE2B 4214406a36e5b34ccde7a88c873c7dade9a06641bbe22bd56218ac54f3f6150667be7fa9d7eb9f40961e6090c2dd6cb86286db61751091da99449863d87d1304 SHA512 ad86404b5c52199e55b8a6ba1764894a937af22a93f09184a2d07b72c256cbf39796cdfae2c005e2a8a21784ecfdcda223769692cc957e28a297691776895d89
+EBUILD vivaldi-snapshot-1.16.1177.5_p1.ebuild 2584 BLAKE2B f8a9b94191de4ba2a8a87faccc0e70123e91bf35ddaef526a9f729dc3971f86920a426e341d5468c4247bc78e749ff8597b7b8382d75916b22a14a12b9215e18 SHA512 2bda7c861a764f3d623d55ab1b21e9bd86b44215b763617889739b247c6a9ca223341669a732383e6e99a92a76e72b537288bbecd5cd5250a2f082b12234bd5e
 EBUILD vivaldi-snapshot-1.16.1183.3_p1.ebuild 2584 BLAKE2B f8a9b94191de4ba2a8a87faccc0e70123e91bf35ddaef526a9f729dc3971f86920a426e341d5468c4247bc78e749ff8597b7b8382d75916b22a14a12b9215e18 SHA512 2bda7c861a764f3d623d55ab1b21e9bd86b44215b763617889739b247c6a9ca223341669a732383e6e99a92a76e72b537288bbecd5cd5250a2f082b12234bd5e
-EBUILD vivaldi-snapshot-1.16.1195.3_p1.ebuild 2584 BLAKE2B f8a9b94191de4ba2a8a87faccc0e70123e91bf35ddaef526a9f729dc3971f86920a426e341d5468c4247bc78e749ff8597b7b8382d75916b22a14a12b9215e18 SHA512 2bda7c861a764f3d623d55ab1b21e9bd86b44215b763617889739b247c6a9ca223341669a732383e6e99a92a76e72b537288bbecd5cd5250a2f082b12234bd5e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1195.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1177.5_p1.ebuild
index 11348076666e..11348076666e 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1195.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1177.5_p1.ebuild