gentoo resync : 21.09.2018

25 files changed, 245 insertions, 778 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1e67035fda1a..c60ac08ab16a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b125ed256875..130796dbf13c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,14 +13,12 @@ AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-68.0.3440.106.tar.xz 630289544 BLAKE2B 9278244aed5a01dac5ccb670951fdfe1f9445224b5ad13d05a0cb086aabf639d4ab08250a93cedaae0be2c4fbab34e96c4862d0155125a90e42a2ac0880c40b1 SHA512 ab94f89e614919932d4d960bac8e5450c4d3f26dea4892e6591762bfaeeb4707a090352d4a952bcb55e34fde4950db22a36004788efd26ffb22b28770e9795c4
-DIST chromium-68.0.3440.75.tar.xz 630277224 BLAKE2B 87c152c14333007223f611acb56360b553c5a4a97026f9cf4ca37d90aa501aabe5e294c3bacbd537c7602fc5dcb010a493c8d64b2881681ddfaad66cd58a3c56 SHA512 99ab36c9a9c224469f3a34f0193b0b4662b626ac29d23711716117cc6fa437717c2c3357f8a95adf9085b94a262c8b4c46727f88bf50bb231bb85af956afbedb
+DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
 DIST chromium-69.0.3497.81.tar.xz 617333008 BLAKE2B c93f04c31a05a7ca29225157f434b27646529aac5e273f8c0e983dde8ebbcb8f32a94bbe6edf7d936f6e989869f49cbea4249a6e7ff7a497f382b0c8ca6d01b1 SHA512 99d3e3212496b3e42133719c6026aec71bd3cd90c7ff689cce509021e038a91986c14d094e6e71ba94600d0c27548b8b33b7084c75d4c2bb8d846b81a4c2562b
-DIST chromium-70.0.3521.2.tar.xz 623774860 BLAKE2B 0476078b44561245b409ff4697ea84f093599f2a9fa089003a0de0e135633eff172807ff065d34b637046db9c2741504626f72dbbd46798233a048c219205f6c SHA512 0bcd3706fa86626b8f03f99b141f70b631797412bf67b455cb24a296a6436802acefe5a040553c65984529e4efd7990c659622aeb64b6a1ae1982014d66d4827
+DIST chromium-70.0.3538.16.tar.xz 622798348 BLAKE2B c9082858b9716f0550892ac3b611744b8a9bf991e61eb51e4e528caa69daa9e9751a12bfc3ef85bdef46b38f4a779cd6a536159279b6c58b4b2602a43ad534f8 SHA512 d2c62b6d5b39fec066e9a6c78484026453d4bfb228c4653c4824ee56a813e7af8172211a1ee7c494aa36b9419b3a2746dc47d879a2ea68300b0ca434f326347b
 DIST chromium-70.0.3538.9.tar.xz 622701284 BLAKE2B e7a8a793787639d9f00fc1b0d5c8f9cf3a282a1dd2787e6b953dea822f001ca05346d384dd54fc439f9b00bba083ccea48a41b49791e476138bf087e16cb38b4 SHA512 96e656be2096a151ad4de53d359e1a49073e1080a882aaf871b0a01f3ad08713e0045ce58d10fd08586b462d9f8b44ac38ec4883b35bccc7028a78ecbe4b449f
-EBUILD chromium-68.0.3440.106.ebuild 20824 BLAKE2B e8d258efb8900284ea8074d7cea6ee3f26cff9ded340e680775486ee90fa86e14aaf18b0ed119c771eba0b5ac176540dea6dbf8b94da1b71445672875a684423 SHA512 da515da6be21b43a7b8d6567a7268f1ff151741f35d606c05ffc8255291530f25a59a201205849b16c5509e3a2af5217b9aa3593e16d1bb96bd23a8c6ef157b6
-EBUILD chromium-68.0.3440.75.ebuild 20823 BLAKE2B 8ea361a14a88d3d737cbd2ed657b7b1b956b313115c9ee072bdb11068f98aab089dcced1eb1a0df782127ed2f729ad646e1a3f8cbe34d4259d5c901735008ba8 SHA512 884096d534c1ff665572621f83424ce5083c5e099214b7865d4ecb21917cb6275cf8f089a3119d6f64a0b4473b39a4ed3185f275996430aa2d5a70253f9e9c25
-EBUILD chromium-69.0.3497.81.ebuild 20419 BLAKE2B f2a9ed6e06ec32a0add6860d5ebd1b6327d1ac98bfbc84072c8e5a50464d790bcd1266a0a3c1a1f0a1e39f13185cca0ad6a74c2ddb9caebaf5112b5bf70b50c8 SHA512 378e79c7a7b0c17ff85625a25a9b9a82e772f97268a5df3a8b1a80c7bf6a673fce71449444c54c7820a5fe01a7bcfbf84564922e5f9cb265b060f54e664cd1fe
-EBUILD chromium-70.0.3521.2.ebuild 20820 BLAKE2B cc885e012430bb5d5c499570ee13ad7829b5e5cc9b16a972c1681686ff12a82dc69e96ff3f2e746678c0c903d3c87c6d19288797975924892c67d98646ca4809 SHA512 ce3f0e86320aee2feb00937301b228ce449708b3c3777e090a4474b1ec72e7e007e17de0c73b19e42ac4c975aeb5e6ac7f08a6004c901ed55d08f8a2972cdbaa
-EBUILD chromium-70.0.3538.9.ebuild 20960 BLAKE2B 6619948b10ba404a886d073934eb55433cd599a739becc12b8f9a96d3dc7f8cb58459f782d42373240db335a25d4da82db11299d61ac5d6f46885889fbda809a SHA512 1bf1c80555c98d4ab182782cd549807d19b29123c85993d0992b3c2686e81af374cc9a9147c99414e38f1bdb667b6798508ac292b3137f16e4a38f74680d3d0d
+EBUILD chromium-69.0.3497.100.ebuild 20419 BLAKE2B 9620d0135e88331bba1d3c68633f299a721bae31358845689512cebb07f6d6ef36ce49a046970df97e6c22c8532b43ea1be0de597dc8f82f86625252a41c0ae6 SHA512 fb0a20c0e36d2652f827ae92f76144ce0bc32fce4f54e38796d3db166175f9e1cc31ba73efd88e7fed9e3912a3e9e9a6d48bbf75fec8dae37f3e061d8f28c72a
+EBUILD chromium-69.0.3497.81.ebuild 20419 BLAKE2B 9620d0135e88331bba1d3c68633f299a721bae31358845689512cebb07f6d6ef36ce49a046970df97e6c22c8532b43ea1be0de597dc8f82f86625252a41c0ae6 SHA512 fb0a20c0e36d2652f827ae92f76144ce0bc32fce4f54e38796d3db166175f9e1cc31ba73efd88e7fed9e3912a3e9e9a6d48bbf75fec8dae37f3e061d8f28c72a
+EBUILD chromium-70.0.3538.16.ebuild 20960 BLAKE2B dd67448e53cde83b2cd565a5d7482fa507badea01147c76b8b1dc6a7cc5eefa933201b3854ac41bfed2d1e1f9eae05d2c038fce06a24ce50580f115ff87e2bb4 SHA512 28c81e7d5addd39ef2a6a893b9a41c474ed9ba80b49d5f308c91e46b96031584233620e5ef2501e196ab29e583c3b0cec588ce592cb8a11a02e1175f8eb20ca9
+EBUILD chromium-70.0.3538.9.ebuild 20960 BLAKE2B dd67448e53cde83b2cd565a5d7482fa507badea01147c76b8b1dc6a7cc5eefa933201b3854ac41bfed2d1e1f9eae05d2c038fce06a24ce50580f115ff87e2bb4 SHA512 28c81e7d5addd39ef2a6a893b9a41c474ed9ba80b49d5f308c91e46b96031584233620e5ef2501e196ab29e583c3b0cec588ce592cb8a11a02e1175f8eb20ca9
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-68.0.3440.106.ebuild b/www-client/chromium/chromium-68.0.3440.106.ebuild
deleted file mode 100644
index 50f8274850f9..000000000000
--- a/www-client/chromium/chromium-68.0.3440.106.ebuild
+++ /dev/null
@@ -1,698 +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-r0
-		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-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-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-libjpeg-r0.patch"
-	"${FILESDIR}/chromium-cors-string-r0.patch"
-	"${FILESDIR}/chromium-libwebp-shim-r0.patch"
-	"${FILESDIR}/chromium-ffmpeg-ebp-r1.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/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/ #nowarn
-
-	#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
-
-	# 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
-
-	# 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/chromium-68.0.3440.75.ebuild b/www-client/chromium/chromium-69.0.3497.100.ebuild
index 3864487463f2..9b12bab541e7 100644
--- a/www-client/chromium/chromium-68.0.3440.75.ebuild
+++ b/www-client/chromium/chromium-69.0.3497.100.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~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 ) )"
 
@@ -94,6 +94,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
+	dev-util/gn
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-6.9.4
@@ -129,16 +130,12 @@ GTK+ icon theme.
 "
 
 PATCHES=(
+	"${FILESDIR}/chromium-compiler-r4.patch"
 	"${FILESDIR}/chromium-widevine-r2.patch"
-	"${FILESDIR}/chromium-compiler-r2.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-libjpeg-r0.patch"
-	"${FILESDIR}/chromium-cors-string-r0.patch"
-	"${FILESDIR}/chromium-libwebp-shim-r0.patch"
 	"${FILESDIR}/chromium-ffmpeg-ebp-r1.patch"
 )
 
@@ -208,6 +205,7 @@ src_prepare() {
 		net/third_party/quic
 		net/third_party/spdy
 		third_party/WebKit
+		third_party/abseil-cpp
 		third_party/analytics
 		third_party/angle
 		third_party/angle/src/common/third_party/base
@@ -218,6 +216,9 @@ src_prepare() {
 		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-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
 		third_party/angle/third_party/vulkan-validation-layers
 		third_party/apple_apsl
 		third_party/blink
@@ -361,22 +362,6 @@ src_prepare() {
 	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
@@ -569,10 +554,8 @@ src_configure() {
 		popd > /dev/null || die
 	fi
 
-	bootstrap_gn
-
 	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
 	echo "$@"
 	"$@" || die
 }
diff --git a/www-client/chromium/chromium-69.0.3497.81.ebuild b/www-client/chromium/chromium-69.0.3497.81.ebuild
index db1988f4d57c..9b12bab541e7 100644
--- a/www-client/chromium/chromium-69.0.3497.81.ebuild
+++ b/www-client/chromium/chromium-69.0.3497.81.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND="${COMMON_DEPEND}
 	!<www-plugins/chrome-binary-plugins-57
-	dev-util/gn
 	x11-misc/xdg-utils
 	virtual/opengl
 	virtual/ttf-fonts
@@ -95,6 +94,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
+	dev-util/gn
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-6.9.4
diff --git a/www-client/chromium/chromium-70.0.3521.2.ebuild b/www-client/chromium/chromium-70.0.3538.16.ebuild
index c70f37c2a62f..64b814054bae 100644
--- a/www-client/chromium/chromium-70.0.3521.2.ebuild
+++ b/www-client/chromium/chromium-70.0.3538.16.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND="${COMMON_DEPEND}
 	!<www-plugins/chrome-binary-plugins-57
-	dev-util/gn
 	x11-misc/xdg-utils
 	virtual/opengl
 	virtual/ttf-fonts
@@ -95,9 +94,10 @@ DEPEND="${COMMON_DEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
+	dev-util/gn
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4[inspector]
+	>=net-libs/nodejs-7.6.0[inspector]
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
@@ -203,6 +203,7 @@ src_prepare() {
 		net/third_party/nss
 		net/third_party/quic
 		net/third_party/spdy
+		net/third_party/uri_template
 		third_party/WebKit
 		third_party/abseil-cpp
 		third_party/analytics
@@ -342,6 +343,7 @@ src_prepare() {
 		v8/src/third_party/valgrind
 		v8/src/third_party/utf8-decoder
 		v8/third_party/inspector_protocol
+		v8/third_party/v8
 
 		# gyp -> gn leftovers
 		base/third_party/libevent
@@ -585,6 +587,9 @@ src_compile() {
 		fi
 	done
 
+	# Work around broken deps
+	eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.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
diff --git a/www-client/chromium/chromium-70.0.3538.9.ebuild b/www-client/chromium/chromium-70.0.3538.9.ebuild
index 1c6ce06aac98..64b814054bae 100644
--- a/www-client/chromium/chromium-70.0.3538.9.ebuild
+++ b/www-client/chromium/chromium-70.0.3538.9.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND="${COMMON_DEPEND}
 	!<www-plugins/chrome-binary-plugins-57
-	dev-util/gn
 	x11-misc/xdg-utils
 	virtual/opengl
 	virtual/ttf-fonts
@@ -95,9 +94,10 @@ DEPEND="${COMMON_DEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
+	dev-util/gn
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4[inspector]
+	>=net-libs/nodejs-7.6.0[inspector]
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 9dff8f1e80c2..25a8b48c9bc6 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_69.0.3497.92-1_amd64.deb 54808378 BLAKE2B dae6939fe4bf46d2e773ad90df2229ef4b914d26e0a4b4e2114fadcd0e42f9a3609f864b7240fb2bbf2b0ef3aeb0b73bf37a102a633ba725ab0fee6db0a88907 SHA512 6bb1cc4612157e8416c9a39874772eb18ff7da28f86cb2e409a6be4d50495932b12aac9ce7973a6e85659cd8f3f65101738677d0135ce3f0d5854729dcaac98e
-EBUILD google-chrome-69.0.3497.92.ebuild 2709 BLAKE2B 1d0e19dba3750d8f89e3b7fd99f3d3f353e183c466bcbe0db4a9f83453dbb3da18829973eece4311a22cf6f8d2e83d311bef9c379101632910e847e6226d7bc8 SHA512 10f86cdf637aa0489c6fa90de462309419085d86b7cbf0634c5baa60a4d764af7064dbc4d5338c4cfe8c137345478e4023f7e1adafca91f66c7a2977256a0aa2
+DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
+EBUILD google-chrome-69.0.3497.100.ebuild 2709 BLAKE2B 1d0e19dba3750d8f89e3b7fd99f3d3f353e183c466bcbe0db4a9f83453dbb3da18829973eece4311a22cf6f8d2e83d311bef9c379101632910e847e6226d7bc8 SHA512 10f86cdf637aa0489c6fa90de462309419085d86b7cbf0634c5baa60a4d764af7064dbc4d5338c4cfe8c137345478e4023f7e1adafca91f66c7a2977256a0aa2
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-69.0.3497.92.ebuild b/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild
index 806c156e4b16..806c156e4b16 100644
--- a/www-client/google-chrome/google-chrome-69.0.3497.92.ebuild
+++ b/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 844b9a7b0cbb..9537fb4ecdc8 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,7 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
 DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
-DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
-DIST links2_2.14-5.debian.tar.xz 15332 BLAKE2B 20c1d0f5a9eeac2f56bfc8d2e00f343ada5ac28e741fdb9635810f7e39563f0f052f7be0492923c3caf6f000246639bf3ae19ebd5dfb3d8fdfe4e4655dd0bac8 SHA512 d8038515c29998be9510723cdaa2b961d65141fd0b0f863e2fac80f41009a100f0bd824acd97735d089c932c1b5a979f0ed523d773721485b4418ec44df38872
-EBUILD links-2.14-r1.ebuild 3262 BLAKE2B b36cb0efef6a64cbdda852843f94b1c628e5fbf834682f827703c78428350a2b2e43797d62a2e266cda5995a333951ba1324e206a4e7f8459bbc2791b595d3fb SHA512 fdedb189b11a0583e9f3fb492764b34397677b826da1963c39ff714449e53bc2741f9d942534089af0e52de5c8214833506f9693c754854b325970e491574f15
-EBUILD links-2.16.ebuild 3274 BLAKE2B 9f581eb2186c4ed5a0807b7620af67cde5362548cd2c887abd3d99fbf77a932a36fe3a48844185943f807d5892ce70237e3e8751ef4dadaa89c31fb5ac1c8772 SHA512 4aee5abcd8d78fecdbe64842d9010858640c2feefe644d7eeb7a9037aedb6f92dca6066d2606b0c140f505d2343971758f70d4052d27dc350010dd80d8aaa1b4
+DIST links-2.17.tar.bz2 6694577 BLAKE2B a762dd810d8d939c3276ca13ed8460cc486d275e3436015440527fdbe16adc29ccf4ff26c59de2354c50cab5fbc6ce72d4b94cc6e731e4295f86f892eaf0af64 SHA512 871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5
+EBUILD links-2.14-r1.ebuild 3154 BLAKE2B 2a7da112c77549c395a25ef5e10e07370f4cef1662b7165f26757b56db9752389bfdea21c24f2ab6d579a9673bad742dab3450280ee9fb37483bd4e6a26e0859 SHA512 7466c89b39e13047cb68de185499bab9e8d89fb6df88610104bf3e8f0693fc0d3f2c03817a5b12de66e63344d07bb318e2675360a29ddf1a03c31797434a3b4e
+EBUILD links-2.16.ebuild 3164 BLAKE2B f6eabfc12eefb0bf2cb96ec494ee464c0c581afca3b4e4142f616e007122158d9bb0c8ef06acf26860377a1c84dbd7eb1b2ef3697604ab9b783a886046c938d0 SHA512 f28d9f11d8a1bf6e156b9ca79a0160861fd5fbb2c3dac81b5c690623e22e1966b0c59fd11134fcf5687b2906a33d537983082e2f1cb0fc7d57485b1328901cbd
+EBUILD links-2.17.ebuild 3164 BLAKE2B f6eabfc12eefb0bf2cb96ec494ee464c0c581afca3b4e4142f616e007122158d9bb0c8ef06acf26860377a1c84dbd7eb1b2ef3697604ab9b783a886046c938d0 SHA512 f28d9f11d8a1bf6e156b9ca79a0160861fd5fbb2c3dac81b5c690623e22e1966b0c59fd11134fcf5687b2906a33d537983082e2f1cb0fc7d57485b1328901cbd
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
index c7f507092747..c7d830ce887c 100644
--- a/www-client/links/links-2.14-r1.ebuild
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -5,12 +5,9 @@ EAPI=6
 
 inherit autotools desktop xdg
 
-DEBIAN_REVISION=2.10-2
-
 DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
 HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
diff --git a/www-client/links/links-2.16.ebuild b/www-client/links/links-2.16.ebuild
index fc5b0de6a65b..de56fbdef90b 100644
--- a/www-client/links/links-2.16.ebuild
+++ b/www-client/links/links-2.16.ebuild
@@ -5,13 +5,9 @@ EAPI=6
 
 inherit autotools desktop xdg
 
-DEBIAN_REVISION=2.14-5
-
 DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
 HOMEPAGE="http://links.twibright.com/"
-SRC_URI="
-	http://${PN}.twibright.com/download/${P}.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
diff --git a/www-client/links/links-2.17.ebuild b/www-client/links/links-2.17.ebuild
new file mode 100644
index 000000000000..de56fbdef90b
--- /dev/null
+++ b/www-client/links/links-2.17.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
+IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	xdg_src_prepare
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with libevent) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_preinst() {
+	use X && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 526f9d41cb7e..bfe1febd385a 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_56.0.3051.10_amd64.deb 57051498 BLAKE2B 4947011b32554ad32e3ea13b7c80e35219e5e273bb6cccfc7f6d0368da740e81b27a5885ec3bdb74ac086696f43576f7c7bf743d27c0cb386321aea987e11654 SHA512 3d52e926b202b5237302b691de5e234cc667a72003caebb090126e9ad12a455dc883293070936ed555b86fa59d3d571b040b5c91623494a7bc20d35902a4f287
 DIST opera-beta_56.0.3051.18_amd64.deb 56518422 BLAKE2B d8df1b10b87c1a49df077199735a8a9ab75a25181e13fee0ec81b9451e7d80bb89707004922d8ebedde283c03722a27591881aa95304e9493db9899bcbe9e669 SHA512 66638a326747b6a58190863fda2b95306a1cf183e836e439dd00d25093cb146cb4cc92ee6f514cffaf4bfaef31b524c3007cf5d035d2338989d1b0fa3cf39036
-EBUILD opera-beta-56.0.3051.10.ebuild 2321 BLAKE2B b09bfa2cc73d206f4d9ebb72efcaa7e9cfbdf4fc351bc97c8ca993d13f54dfcc96c0119ddb2503b5b041489ce57bff76faa1b300263fc3ff14094a580f847d31 SHA512 31332154b99d40920a9898923af02d8009f0fedddd324fdf2628e60239509a2d58e2a8484d0090cc5a458947e4f5e7e02e465caac866c134b08798958d7daf60
-EBUILD opera-beta-56.0.3051.18.ebuild 2321 BLAKE2B b09bfa2cc73d206f4d9ebb72efcaa7e9cfbdf4fc351bc97c8ca993d13f54dfcc96c0119ddb2503b5b041489ce57bff76faa1b300263fc3ff14094a580f847d31 SHA512 31332154b99d40920a9898923af02d8009f0fedddd324fdf2628e60239509a2d58e2a8484d0090cc5a458947e4f5e7e02e465caac866c134b08798958d7daf60
+DIST opera-beta_56.0.3051.28_amd64.deb 56825330 BLAKE2B d4e68402793db977f1a9722140802e755e65a208e9b99e497132aa3ecb65fa6df5b5b10be160c08a933929e6d132c0af7ccf2148fbc8c52cc4ebf8179f6effda SHA512 8933173f70425997f4ec35864f05d7bd60002516be1095685d86887019bdd451b55b207a16fbdd6b3a49f5e1cca98b8b58277c23ea4ff011385473d14eb221d1
+EBUILD opera-beta-56.0.3051.18.ebuild 2321 BLAKE2B c69702f75840d6023471010024926366e861d5e0dcb330a49faaea5cc32aae4d82af89abc62360592f80f73fc6701fedb300b381d1cbd2c697edf8d95881544a SHA512 923d0cd12aec9f692c1768d6a789b2e7bafb026e7d3b17d213414d87105b915f0be8f9315ff32e90663554416e0a9cd323a12e33e442e0b772a9210de3b2942f
+EBUILD opera-beta-56.0.3051.28.ebuild 2321 BLAKE2B c69702f75840d6023471010024926366e861d5e0dcb330a49faaea5cc32aae4d82af89abc62360592f80f73fc6701fedb300b381d1cbd2c697edf8d95881544a SHA512 923d0cd12aec9f692c1768d6a789b2e7bafb026e7d3b17d213414d87105b915f0be8f9315ff32e90663554416e0a9cd323a12e33e442e0b772a9210de3b2942f
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-56.0.3051.18.ebuild b/www-client/opera-beta/opera-beta-56.0.3051.18.ebuild
index 135872778f99..7febec80c8f9 100644
--- a/www-client/opera-beta/opera-beta-56.0.3051.18.ebuild
+++ b/www-client/opera-beta/opera-beta-56.0.3051.18.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
diff --git a/www-client/opera-beta/opera-beta-56.0.3051.10.ebuild b/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild
index 135872778f99..7febec80c8f9 100644
--- a/www-client/opera-beta/opera-beta-56.0.3051.10.ebuild
+++ b/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index f09dbc273e2e..c5560e493daa 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_57.0.3065.0_amd64.rpm 55367540 BLAKE2B 62809c5b986c11517bbac2f941964df07dba2feae16cb974b189fad6fdd29d92c3f198c09ae58aba751c8abb3e3301b87a6c8aca8c1eca0fc6d3f04ca402b489 SHA512 c328381fe9f303e35fae3e3d995c5a186fe885edeb7e86c6de4542133793e7885dbd579e2451a21d95cbdf0941f7a891523486d0b410b9d2b740c3589083ef28
-DIST opera-developer_57.0.3072.0_amd64.rpm 55503092 BLAKE2B 9e326fa416e707057895257aeb3e248aca57e3b3d748d707684e2392f331b3a166bdceac7e8b66e74312442438a71161ff9dab38eeb89a5316c47d60e6a38869 SHA512 4645a6edcf6cb52203637e316930f670f3c08cc4c2ca4c90234daa12e63b91051a5e4bf80e824c1d516f1e771476e4fa2d96b1b1eedf23740c8254fd7fc80a20
-EBUILD opera-developer-57.0.3065.0.ebuild 1995 BLAKE2B 071d792a572d4b519436d1be9d6d03fced665f9f11d213fc194b9466b1a53355c8525a7af268a2278fbc64dae79d7687557010c03af6cb1addc35207d006a33f SHA512 c09ac24c9c3d50272cad63f5fcda6463d1a16c6f72e74ee18162a8c51147f890bdec196d724693148706f85ab12da2db4b55bbb6ccb14ce5da89fe516b89a8fb
-EBUILD opera-developer-57.0.3072.0.ebuild 1995 BLAKE2B 071d792a572d4b519436d1be9d6d03fced665f9f11d213fc194b9466b1a53355c8525a7af268a2278fbc64dae79d7687557010c03af6cb1addc35207d006a33f SHA512 c09ac24c9c3d50272cad63f5fcda6463d1a16c6f72e74ee18162a8c51147f890bdec196d724693148706f85ab12da2db4b55bbb6ccb14ce5da89fe516b89a8fb
+DIST opera-developer_57.0.3072.0_amd64.deb 57858176 BLAKE2B 338f5eea5585c774cd32f2216fd3877ca940c2fbc71a1ae30cf50afaa63e31ae5e00a6a5de298ade5df51de47fa09eb3752b1b0a00326bbf3ebe540d5dd12e52 SHA512 d01f5e898b54aedb73d05fec77926d4c7a3033c3b7bac9931cbd923989ab81aa7a7f152ba80940694e9dc12a3bda1b3b0c3d3c97cf1e93c7cc5cf55fb8c619e7
+DIST opera-developer_57.0.3082.0_amd64.deb 58678266 BLAKE2B 0fbed5f242581a907fccd14ad8362172d15d22d8a149386dbfc7f008a326f06d783533735530cc7e1ae56bbb5203f05697075a81266f556613eb7630a3183fc5 SHA512 f697242f9aa29794c82cf70db2f80a170336ccbf5416c76aa08779d4ae29848aa17bd9c429c0009ec1fad8504808f6b82da5270832831632bd09469cd32490ef
+EBUILD opera-developer-57.0.3072.0-r1.ebuild 2242 BLAKE2B 21468f533de2510265a623401d4deb9024ee55c0c1edf48cfa2c991788180ca3fcd286bc924d003b9646d77d5bae7ded6f353f11e7a770b50a2333ac3b7af535 SHA512 de35508ca08c9c87f8f5f80ac1c5b521888e3a84e378fdb2f24f69015d8c09212a7f2cd2a81b1fe39b7a1df6731997e03d9eae923f3868d2ead3e1a1841ce846
+EBUILD opera-developer-57.0.3082.0.ebuild 2242 BLAKE2B 21468f533de2510265a623401d4deb9024ee55c0c1edf48cfa2c991788180ca3fcd286bc924d003b9646d77d5bae7ded6f353f11e7a770b50a2333ac3b7af535 SHA512 de35508ca08c9c87f8f5f80ac1c5b521888e3a84e378fdb2f24f69015d8c09212a7f2cd2a81b1fe39b7a1df6731997e03d9eae923f3868d2ead3e1a1841ce846
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-57.0.3065.0.ebuild b/www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild
index 6fcc60aa4c6c..bb41cc9d6e5c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3065.0.ebuild
+++ b/www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
-inherit chromium-2 gnome2-utils multilib rpm xdg-utils
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -22,7 +22,7 @@ SRC_URI_BASE="
 SRC_URI="amd64? ("
 for uri in ${SRC_URI_BASE}; do
 SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.rpm"
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
 "
 done
 SRC_URI+=")"
@@ -62,7 +62,23 @@ QA_PREBUILT="*"
 S=${WORKDIR}
 OPERA_HOME="usr/$(get_libdir)/${PN}"
 
+src_unpack() {
+	unpack_deb ${A}
+}
+
 src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
 	rm usr/bin/${PN} || die
 
 	pushd "${OPERA_HOME}/localization" > /dev/null || die
diff --git a/www-client/opera-developer/opera-developer-57.0.3072.0.ebuild b/www-client/opera-developer/opera-developer-57.0.3082.0.ebuild
index 6fcc60aa4c6c..bb41cc9d6e5c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3072.0.ebuild
+++ b/www-client/opera-developer/opera-developer-57.0.3082.0.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
-inherit chromium-2 gnome2-utils multilib rpm xdg-utils
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -22,7 +22,7 @@ SRC_URI_BASE="
 SRC_URI="amd64? ("
 for uri in ${SRC_URI_BASE}; do
 SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.rpm"
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
 "
 done
 SRC_URI+=")"
@@ -62,7 +62,23 @@ QA_PREBUILT="*"
 S=${WORKDIR}
 OPERA_HOME="usr/$(get_libdir)/${PN}"
 
+src_unpack() {
+	unpack_deb ${A}
+}
+
 src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
 	rm usr/bin/${PN} || die
 
 	pushd "${OPERA_HOME}/localization" > /dev/null || die
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ea2d82fec8e9..51127a00a16f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -5,6 +5,6 @@ DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c69
 DIST opera-stable_55.0.2994.59_amd64.deb 56138728 BLAKE2B d366a23118b4f830f7ef5b0ee3ae22b76abd16461edbe367b1bb4da73ab4c0b891debc5d714c9eb3565915e05193744c18cd0b3bb22eacc4e5e51db3e8ca78ce SHA512 f16dfee13616c99041f6d2e1bf89efdd0cebb828abe715081e93be40c4251203c5392abe88a07c6893c56b41dc0b15aadad5afb08021e6286034174306fdfd06
 DIST opera-stable_55.0.2994.61_amd64.deb 56894912 BLAKE2B 536629564c0b0b3e80020ecd7e5e074f38304095f670848d4086505b613bd3dcf8768deabb5a67a2dacfb3fc3d1e19f5075b60e7fe90150b08722b7b11bc1e97 SHA512 dcda8466c67b4dfc9663ee81f219db97d62ab576f8809c9d99f7c4834fa94643a82734cbb1d5f92cdd25cddb786063c79e142efb7ae1babc621d1373fffb958b
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-55.0.2994.59.ebuild 2244 BLAKE2B 29a9abb8eef54f8a45263e1fa5fa114de5c5e5c04a792ac829c64fd1dfe2fbeac65eb8ef2a1118a69ee7c461edbbdcf4af34543fe25e2d7c67e12ff619f602ff SHA512 98a4dc3cf7b5b0023a11837b8eaeed8f540351473634b5f61d9054dda004fbb4b38d26710b8ffa22fa6dd3dfd36a36a330754f0ceca17dee8d304b183a99a1a5
-EBUILD opera-55.0.2994.61.ebuild 2244 BLAKE2B 29a9abb8eef54f8a45263e1fa5fa114de5c5e5c04a792ac829c64fd1dfe2fbeac65eb8ef2a1118a69ee7c461edbbdcf4af34543fe25e2d7c67e12ff619f602ff SHA512 98a4dc3cf7b5b0023a11837b8eaeed8f540351473634b5f61d9054dda004fbb4b38d26710b8ffa22fa6dd3dfd36a36a330754f0ceca17dee8d304b183a99a1a5
+EBUILD opera-55.0.2994.59.ebuild 2244 BLAKE2B 882afd146bbaa37a89b4a2e03b258af9f9448b2121d611f153bd43765a4ec3507fd5e7d2d3d5f3e1b649ba377c3038e6f2f11655701a50393aff0f506742bec9 SHA512 146203b0e50c6e993037ead9803bc2cd396f9c663f64c9342393271aae5b62fe5d8ab6ad579ca7d3ab2811fcd2ada328c97e6bd984c51431b54042388849c0b3
+EBUILD opera-55.0.2994.61.ebuild 2258 BLAKE2B 46fd91a67c6957e3d91c1ac8ee10e823ae01b1d8c70613e3ffde5e342d3f21810ac6d036e5306e42700d503892bfcdbbdc81e53b2a2cf972ed66bb986cbc0a8d SHA512 a3d6ee9b6eb7c29911cb8ed2f5bbf2f35b0ff2a4932fb22a7f6d39643d5edc5a465f0a8d4ac38e8a3052f592761bae70f3c80e3fcf52ef79a9380fa4815a9d41
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-55.0.2994.59.ebuild b/www-client/opera/opera-55.0.2994.59.ebuild
index 23b9ad88ecc4..7fc7eacf82a9 100644
--- a/www-client/opera/opera-55.0.2994.59.ebuild
+++ b/www-client/opera/opera-55.0.2994.59.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
diff --git a/www-client/opera/opera-55.0.2994.61.ebuild b/www-client/opera/opera-55.0.2994.61.ebuild
index 23b9ad88ecc4..36e972f68391 100644
--- a/www-client/opera/opera-55.0.2994.61.ebuild
+++ b/www-client/opera/opera-55.0.2994.61.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
@@ -65,6 +65,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch_user
+
 	case ${ARCH} in
 		amd64)
 			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index b0ee0f7520cb..fc94cf99089e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.0.1302.3_p1-amd64.deb 57459330 BLAKE2B 257abe9f38ca3a3477281ebb277a1e9bad2776364dc11f1eda78c8dbf3e54ce63a8f9be4f747358e1fcff5773ebb21380c41160fd01b7e4345a0663a108916fc SHA512 5d8c8a6488c3ce009208a0428dab291cab9eb50c12accfca8c6c61df30120863e7d9f6ac4ea8a47374a47a7a0902da10649a51f387620ca1d90d6a97fbe152ec
-DIST vivaldi-snapshot-2.0.1302.3_p1-arm64.deb 49802990 BLAKE2B 7a10b44009612be90d598d071153950df5addc6cbd34b1321e9877de25de6bfc1ce2b1709c2ef02915bc051163dd957d467535cec17392eedf4b18d90c564e12 SHA512 a94a2e5004fd36d9aef0d73026b0443a9edeb739e9fd438eacae396fe0fccdaeeb68b3055a3252ee3f26969a9e88c7a8c257085a890dcda4f723478ae0401def
-DIST vivaldi-snapshot-2.0.1302.3_p1-armhf.deb 50843704 BLAKE2B 056ccc1d0e67a2272addc5545d077bbf32aad499354341b4cb1659a6738004bfcf911741f8d228d8153df3d7a7e10629c542b52032c4ba8cb7c88ad86cc3b9f1 SHA512 aad2b698d7111c9277901a46f1c207d95f66a724e45e58225311405b044035118dbdf5fff6de06839d89d8b8607a6fc730425ba83323223f4b96ddc29159c7e4
-DIST vivaldi-snapshot-2.0.1302.3_p1-i386.deb 56656506 BLAKE2B de4f202b5f7f9991b89187f28bc571110e0f2876dce6829857d76dcc8149df68a0a6365292202b9ff4a9aa7a6ced47abd1f66ecf1289d991fd20d873109dfb3b SHA512 40a910f9d1bb2590287ac05f80c56f123d21057e68e5bb9d3f58e10a824a3372d696f922aefc4c81b705c8f1751779ef76022e8dd7236103f6f542571ff42462
-DIST vivaldi-snapshot-2.0.1303.3_p1-amd64.deb 57461120 BLAKE2B 684f391a6f9dc03899339d2106debdeb35ea90bd75d46ef3fad656f75399708c23ae0a920bb2993dcc869c240b02a029699ee6f608e02d97f6b02bfe90105e17 SHA512 d99ab6b874e9f795d32e4009bcb592f333fb71de44b1106ce061838225fadca7226288ba01b973cc6758f417c3370466e2f6942bc9b526b9ad7a3b343b5fdd36
-DIST vivaldi-snapshot-2.0.1303.3_p1-arm64.deb 49786848 BLAKE2B 9180c893af0bb511e64f8c651a6f6140760584ddf30cf12b4a20c96ba0acba165efbeb63cf3c232a60ac19dcc9c115b1ad38ce783f18d9eb00ca235db01990e5 SHA512 cc4ea521e173467bc69909cb5d1a658c58613f418016ffb645abbabd3e5c42ceaae7dedfae4ee0bfe35b997bace1792d73f8872d96701dbc26c6fdcc6cbebcb8
-DIST vivaldi-snapshot-2.0.1303.3_p1-armhf.deb 50825626 BLAKE2B 55db5e1debbeacb73aeced9f043fbe81cec6be92f35e6c42f47ac8058e7fb7a5caf0d059f209ebc4bf1c54fa86dea8c9237e03429909534a39d14d8f64574290 SHA512 18b6d6a2a2e9ebefe5899a68afcbc1c094c295ad2ca29e1c16ceda2d0b8bc55cfe0a5776af69cadec015ef81277d7a9cb4217c1f713e757ca321c2ffcb3fdd89
-DIST vivaldi-snapshot-2.0.1303.3_p1-i386.deb 56661988 BLAKE2B 95ed3c8797c2097181b826cd4a7e9bfc9a1e7ad09dc550606ac4be52abdedf492e103cee2794bed17900fa82b50817b6014b69f2da45942283d99a60b96009a0 SHA512 e19365f07b27889329e7770ab2dfda7d65e70393fa9b6267af7382c13783e95ee779ec2fd1e0152639eee49f4a4d7259b959ef84311df4672bd87f5a09e6641a
-EBUILD vivaldi-snapshot-2.0.1302.3_p1.ebuild 2575 BLAKE2B 00cb85587640145bdcfced76499c23211fd13f2fd7f96a2204445dec44c1243177ac692d921a90853dee22ae39030c06ceeeda5d38e0496d6489ce86c3c38d87 SHA512 8cec999c367acb3ed2fafc9c9e269e3a9a56c01f527cff9413bbc9d58864a5755bd2ba0e5a46565179e00a2bf9af2ff68bcf65db5d3abb46dcb56b0fc5adba10
-EBUILD vivaldi-snapshot-2.0.1303.3_p1.ebuild 2575 BLAKE2B 00cb85587640145bdcfced76499c23211fd13f2fd7f96a2204445dec44c1243177ac692d921a90853dee22ae39030c06ceeeda5d38e0496d6489ce86c3c38d87 SHA512 8cec999c367acb3ed2fafc9c9e269e3a9a56c01f527cff9413bbc9d58864a5755bd2ba0e5a46565179e00a2bf9af2ff68bcf65db5d3abb46dcb56b0fc5adba10
+DIST vivaldi-snapshot-2.0.1308.5_p2-amd64.deb 58854576 BLAKE2B ad129e024b5ee97c23df45b12d78a3a8372118c5ac8a1e88aae20ba1749fe9192e554be05d2216aab3eae6deb77cf046db5da450b02b04669076ec6555fbc847 SHA512 fdeedf5eaf7618eb6bba983cb64d5f883e785c6b4da6b0db12bb2b4c1c0e3d7d3bb4668529681c0a6e3f377178beffbbf33f980000c0dafd9a6b2acc29012066
+DIST vivaldi-snapshot-2.0.1308.5_p2-arm64.deb 51159840 BLAKE2B a6d10077c09418b917626ce555b17b0a9cfcd62d5478e006f40400c3ae6c22ae3c69daa1197bf3be00af73dc9a94c177373991f6d91b8d88ed6292398a8a6034 SHA512 461648528b63f0d52426db1815a1baa004d7e653dd6e8386da5b5c5f658f26ce3ca19f68396f520057741c274e85d2cead9495b8f902a16af042e548c1f3c045
+DIST vivaldi-snapshot-2.0.1308.5_p2-armhf.deb 51986344 BLAKE2B bc03e182ac68b525e290c2a78ca3ec0e49f7c585173d5b286048c11e95a78433ca3896426f874c14bb3b9f1785ee5c770ecd2129530234db2a9a8df26290949a SHA512 e5b9265db19077527a37aef36d5955e968cc298277622ffbcabcdd5d2cbf699d7b39eeeaf875a9b8d92fdb87a633a1c8941a7935e2701195193161bf82c56fc4
+DIST vivaldi-snapshot-2.0.1308.5_p2-i386.deb 58081422 BLAKE2B 53f4d35a6c30e090269fc81e64359a91d5433507ff8bd2ea3a34df85e7d2f2840d06120135fc61ef341902eb2453bdfaa2c96ff809a57d58e6f0f00f88bfd285 SHA512 5480c3ae6431767f4af44ce5415b435f90b8852eef5faa370b3be242742b8060d2368d3b7b47dc2a5668d6774dc96ca14fdba1ee9296471ecdd853ace9d52145
+DIST vivaldi-snapshot-2.0.1309.3_p2-amd64.deb 58856290 BLAKE2B 1663fc631f45d6e4330ede44b5c2a632340438edc92005e94681d13498ab93cd49141f9cd7991f5b2725ea66c2fec4bca1625fd7eab8de249c6492332afbe96a SHA512 d11d0cb2e5537c104cc973e0f4df19693ea06a773c432a026f208966e01689b72112397392b65b0ece65f7e421f9195cded32182eeca6e0876195e24280dd8fa
+DIST vivaldi-snapshot-2.0.1309.3_p2-arm64.deb 51163578 BLAKE2B f1a82154a26368539049f5168f6b29859c5fe8fb2a4e4f8ebb563d0c984c0346e7e98a17730ba851e3ee57f75089efe6cb632144056dc0eeb4ce14a68af4a9f8 SHA512 66aa8bc38b362715394f445a9a27cb66b57f1fe8c818fe7805d73b05f715029ef30d68c4942cfa1e04d11820d57ff63d25aa2095405d4238a0de531658b6f410
+DIST vivaldi-snapshot-2.0.1309.3_p2-armhf.deb 52000054 BLAKE2B 39167c93f9c65ea6fadc343db5544708bd8f46d69dd0b4cb0be633afff94ee6ea7e2995d46572f979a138b6ae3313ced25f3677a33e515ded46ae2254e891a84 SHA512 cf4227c2a2911d412ed87711a797bf56f60e92b6526fe7e6ece5273c05525bf8e4138e8a986c7c08d1d463ff07fe4aae63ab5384c6aff3712bfaa51e6d058a1c
+DIST vivaldi-snapshot-2.0.1309.3_p2-i386.deb 58071346 BLAKE2B 4eb96a8228327e560a6fe6edc1ad0e59719b99b3a24761d4f47af97e8393c6318d6bc20e7272ce1fd152e4a4923a02d0bd424813a9840a27e7f160e67e8a4dee SHA512 9a3cdfac7be80d860c878b1990dc474af60693558aa14bca4789f5b8c3279be7cda4490b86a88f0d0b0fab4216fcdbf569a0410999a5c23f4c339e30e6cce782
+EBUILD vivaldi-snapshot-2.0.1308.5_p2.ebuild 2575 BLAKE2B 00cb85587640145bdcfced76499c23211fd13f2fd7f96a2204445dec44c1243177ac692d921a90853dee22ae39030c06ceeeda5d38e0496d6489ce86c3c38d87 SHA512 8cec999c367acb3ed2fafc9c9e269e3a9a56c01f527cff9413bbc9d58864a5755bd2ba0e5a46565179e00a2bf9af2ff68bcf65db5d3abb46dcb56b0fc5adba10
+EBUILD vivaldi-snapshot-2.0.1309.3_p2.ebuild 2575 BLAKE2B 00cb85587640145bdcfced76499c23211fd13f2fd7f96a2204445dec44c1243177ac692d921a90853dee22ae39030c06ceeeda5d38e0496d6489ce86c3c38d87 SHA512 8cec999c367acb3ed2fafc9c9e269e3a9a56c01f527cff9413bbc9d58864a5755bd2ba0e5a46565179e00a2bf9af2ff68bcf65db5d3abb46dcb56b0fc5adba10
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1302.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1308.5_p2.ebuild
index 20db390fedd8..20db390fedd8 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1302.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1308.5_p2.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1303.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1309.3_p2.ebuild
index 20db390fedd8..20db390fedd8 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1303.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.0.1309.3_p2.ebuild