gentoo resync : 21.07.2018

21 files changed, 712 insertions, 36 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 804a8e2492ac..281b5257b78b 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5628d20c7e33..6ccc93a3a5aa 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,11 +16,13 @@ AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b01
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-67.0.3396.87.tar.xz 591491608 BLAKE2B 9069c4b2e000e180a9b21bbdbb67428817073cd662830f7e736073833f2e6ab2f94f3127d15ed521e34c82de727f137e0065fd3aa7fa7312c4940b1bd8959ccc SHA512 6f9c108b70b63cd45e8238c1962ec11d4f2d01e4f2a6b6483bfafc7986ed6001d5f09f9b0b893c864a08bade9d93346395bb2d045dcafb2ef94b0f4e00f2fe0d
+DIST chromium-67.0.3396.99.tar.xz 592170796 BLAKE2B c214f2feb911bd375849f1c69a67dad797111107be7d8c7b99f503e67a62212c0340c8c21b1922cf0a5bfdc32507dfe337a9cddeb29674067c08e6e21a8585a5 SHA512 b1cc7f5988d30efae0b3954232a402e2906bb27113f453a67d865a79afecf6a124c7833635d6083ea40f0cb7344e3cdb4a02f3b8ba4b1cd9798b5d2bccb23242
 DIST chromium-68.0.3440.17.tar.xz 624240248 BLAKE2B 9322f731efbc218dbefec351984f93bac5deedee3cc5ce426a619262d885097f28d8532a3d5b55e8daacd2c28dee2dd85dd4063687cbc7ed7d125d2a2a48f885 SHA512 1a6af7c5f3bfe87b37844c9d863f512aa464de75252487877d7796fa0dc246a533357086c64701f624809493eef97fced23d3eaa449819b38ce6038227015d35
 DIST chromium-68.0.3440.25.tar.xz 624353904 BLAKE2B 8ed052e5ad831499367ef1e6d40d08bb585e49855f4c6b820d5532c96f240ad312e66484b75b5b8398e737e2400b7ff1f9edd944b5f6a16d81ace019f6dd0952 SHA512 c82436dc42dd9ee1b87881d617f6c791a9dc04d85bb1d4588a3cf31009edd8aeb9d89c357581f705e3602580be1d70ab5fd85f629abf7c7f647fa8a5f06f3add
 DIST chromium-69.0.3452.0.tar.xz 627961940 BLAKE2B d7e910c746f485595e180b2733ac6bd012ef2a58b72107ce7e8f0a2d30a3b1fa1274b93a607cd05e9a86d4f68520af1cbe5b97b828a9d9d5dd6fde0837995880 SHA512 3dc005c8c93eced4275e5baf01e17582c95e4278a4497d2e1f0c95ab0dc426753bb6a6440d1cc654847d58524f01e4edd2a24f90c54e4202e96bb68b2b127df8
 DIST chromium-69.0.3464.0.tar.xz 634891812 BLAKE2B 2cff114b4c6af03d3a6bc79df68876d38d9d8cc972faed2d3d0a3c565911fb2d32e467a4cff1ca8d5c234fece983ab1bb1b5be12bfdc1041d823fde645050f7e SHA512 d14414be553faa9d327dbb9348edcbc755f7f8346825c5144e65a25acb21eec07c34713180ed5701830ccadda99c171e279ae40a620c9babd187d0d093c8a87b
 EBUILD chromium-67.0.3396.87.ebuild 20544 BLAKE2B 07e05f7ac23edef490bd16a7936e5ad91878b30a3b49fc88a600bfa8ca8948ad4775ed7568e90a35af7859146f14edb124c56b377e8cfa3ac99039c9e39782cf SHA512 47ab5e077a4690c538643efb7884815368ef074f358f99cb3021b50675a44487abb216d71bbbafc287005d064be3bf4f59dd0596e053bfacb63907f2feed3f11
+EBUILD chromium-67.0.3396.99.ebuild 20545 BLAKE2B 9869b9b00d88e4a1bd5a3d3eb29762e4dfa3100b18d78b6a427b2b5ccf6abc213a6a9dbb10b1a2ee44469f9123ad7592ee5be613a19db8a017bf635ebe00793d SHA512 987ad9083056cb7308d526d609f1d7323208bc096fa5205b946bb5e05a7e0778433d5ac0e6a7de0ceef532f017d2880c7dda49ea2ca7ced1f5c3eb09424f046e
 EBUILD chromium-68.0.3440.17.ebuild 20513 BLAKE2B e7e264516f43d6a6c71058c16986ad83142afde8c51951bbd9e40489bf2330c00dc69a02afaf27bd81e1efb7ba68ebe9dbc09baed79ff2699b57446136734d05 SHA512 a8e6d827d86c26a24df5f8d1962d5085bca931526089277b46b1faac269a460afcad02e34588205a39d84c4ab92cd05d2d2d79660490bd3785adc85d174a1a1a
 EBUILD chromium-68.0.3440.25.ebuild 20513 BLAKE2B e7e264516f43d6a6c71058c16986ad83142afde8c51951bbd9e40489bf2330c00dc69a02afaf27bd81e1efb7ba68ebe9dbc09baed79ff2699b57446136734d05 SHA512 a8e6d827d86c26a24df5f8d1962d5085bca931526089277b46b1faac269a460afcad02e34588205a39d84c4ab92cd05d2d2d79660490bd3785adc85d174a1a1a
 EBUILD chromium-69.0.3452.0.ebuild 20532 BLAKE2B d1620c82f68614e7d86c3980e390a2d7bb457cef6224ac8b0d5820ffbe3d033beae3f5e67e3fcecfa7d2cad720d1c1dfba524704b4a648914335838c62fd9483 SHA512 dcf2cec652fdcc7aaed040a90d2071b897da5bc42d8ad9f707f52a253e17478f14834b69728f9fa834806c7f00ce4701ff0763cdc58251715ee5a62975f554d4
diff --git a/www-client/chromium/chromium-67.0.3396.99.ebuild b/www-client/chromium/chromium-67.0.3396.99.ebuild
new file mode 100644
index 000000000000..48fa2fe9d54d
--- /dev/null
+++ b/www-client/chromium/chromium-67.0.3396.99.ebuild
@@ -0,0 +1,687 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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-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-ffmpeg-clang.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/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/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/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/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		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
+		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/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
+		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/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 5b200b3a3e54..2e331ea1fa32 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_68.0.3440.59-1_amd64.deb 55308360 BLAKE2B 275ac7be290dd2a81a2756f5598afd998521297ff9c36a33efb5e6e3cf6802b66b0b52510a4c382c2ddfd51eadb218c0b14d084f92f594f8652835aae337d7c8 SHA512 387694d29e63c819f963a4bcb4404d2147f3eb36867c5754813bc70f4cd18007539bfa3cc598886d961211f1b5a67548592db1f55ca6799f7fcad1be498c5ba9
-EBUILD google-chrome-beta-68.0.3440.59.ebuild 2705 BLAKE2B 0cf0e9848ec37120787e04c9d9da56c039548e21c0945104ed6bee30f6bacc62725a422900102d5d512a646e01e2cec024f1d0d152ec7819c6fecc4f04c85c8f SHA512 734bdb01f0289da14867f7a611651bd1900f59d399909f05fcd26f4760885cc7b2a050ed745c2b7cbb89782e0d17a0c063a1a6f1707a30967c4b33b15b3f6b7b
+DIST google-chrome-beta_68.0.3440.68-1_amd64.deb 55349226 BLAKE2B da63bbc6cb530c9249ba3c352a9cca6ac605e261309dab1d7c4069e12576849c9a0db3903163478dc97c4593829ced6bd2ecc9d846e78d4144f0d984d9da3444 SHA512 b00e4e2f14691b55b662c427890abad5d668a808df4f7900bc38899a9c7aa631cd0f948254ac7a18326899cee48f12abf7dc7d6732966a1330b528e09e6d2714
+EBUILD google-chrome-beta-68.0.3440.68.ebuild 2705 BLAKE2B 0cf0e9848ec37120787e04c9d9da56c039548e21c0945104ed6bee30f6bacc62725a422900102d5d512a646e01e2cec024f1d0d152ec7819c6fecc4f04c85c8f SHA512 734bdb01f0289da14867f7a611651bd1900f59d399909f05fcd26f4760885cc7b2a050ed745c2b7cbb89782e0d17a0c063a1a6f1707a30967c4b33b15b3f6b7b
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.68.ebuild
index 5a6e7f384b95..5a6e7f384b95 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.68.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 8a6228e96e03..6c0a964b151f 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_69.0.3486.0-1_amd64.deb 56203802 BLAKE2B d73fe08d1c2046a362029f0b5c7bda3263e3eb76bdda9f8ac5fec8290fcd96af9d018875510efdf2ed25e62add464ce33cdf210348074d4c461fb55e387ff833 SHA512 5b0e33c2ca34347227fe6ccc85c611e4b970bbc85fb1bf1b979a2af11aaf723896e6d9e1ecaf19cd4cbd7b794426eead3d4800853707b126c0730de1aa47864c
-EBUILD google-chrome-unstable-69.0.3486.0.ebuild 2694 BLAKE2B 2bc43982ec155ed3e7b416348d7a58227b2d326f2bab4349d6cdfa216e88c4bd78529301e97ad16a36dd9226d71ab0b748ba262f3e80cbef26fbbd8525c3c286 SHA512 25c03f363aa887f119c763528698b5b370196897ba3344cca4334ef0f232f29a57137fb21fef3e9d5fd696988eefb853a3b0dcbfdd023a57773d940bde4c547a
+DIST google-chrome-unstable_69.0.3493.3-1_amd64.deb 56266178 BLAKE2B 5118ced09490b717d994c58abeaf92a73262303fb93a1421924b609dd1c67f4e465670402230aee348cd97b34ef5e3cfe902a4ca0805ce28caad5e45c44796ea SHA512 2255a1abe7abf8673d6fb0112107b00fe393e5c381f1ce2fbed190746ec64c13bb83fe0f25afc04619e3a8af96fcef536979abc353730185021c2a52fc3f10f7
+EBUILD google-chrome-unstable-69.0.3493.3.ebuild 2694 BLAKE2B 2bc43982ec155ed3e7b416348d7a58227b2d326f2bab4349d6cdfa216e88c4bd78529301e97ad16a36dd9226d71ab0b748ba262f3e80cbef26fbbd8525c3c286 SHA512 25c03f363aa887f119c763528698b5b370196897ba3344cca4334ef0f232f29a57137fb21fef3e9d5fd696988eefb853a3b0dcbfdd023a57773d940bde4c547a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3493.3.ebuild
index 550065b04c3e..550065b04c3e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3493.3.ebuild
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index be1b00b78cea..e352bdc59a70 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 2591 BLAKE2B 559f8a7080aef6f28af7195f034e873c89b38c76b560f63722f0702efd1a0d20fce23052a8b590d9751e6f60ad24bf31371f3542862e30cf530b7e749dc70196 SHA512 e0cd8442843fe71cde0458ed9027e7ff9558ab6430c2c0729f9ec6b525faa90b72f1c7e80712d01e212d63aafc844ec26f50d161b412e1bbd424c79a3ffd6408
 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..148afaac73de 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/opera-beta/Manifest b/www-client/opera-beta/Manifest
index e79b19b20428..c4450a4faf98 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_54.0.2952.40_amd64.deb 55438378 BLAKE2B 8d446bb5d32553b6213d60718912ae72b5c7e3d4596c26bdf0140d379a0b6c14e217821e3e2298fbe77e2a094d3f7d7697db2ff53b19c23fd304ab1642b0179a SHA512 987ded440347ae6dfcfca691727b65a6e87fcd0fd1a90fe20812de519dda01f780655cbd024b0021ca22fc9b3f358dac526a91d1f0eabecf001cde97583b2af5
-DIST opera-beta_54.0.2952.43_amd64.deb 55136488 BLAKE2B 65233c91466d1c63e3c0a11964b47fa0cfc7c84f6cdbfeacbf032afc4d75715cbfe31b6b20ccbc1719a37e38a659ae1b3de75da365b412c93b99cfc4a297d6d7 SHA512 92df67403521b836ec1d002bc2e2a99ea949b638f8829b12179fa95903ff21196d2e93cb98afa65664db9cc43f044060a3bae1df3bf57e8427b7ee25d07338ed
-EBUILD opera-beta-54.0.2952.40.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
-EBUILD opera-beta-54.0.2952.43.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+DIST opera-beta_55.0.2994.14_amd64.deb 56678992 BLAKE2B e45ff11cb7bcf9aceee30cac64264c1dab49d799d96b07c39f9e3ce5bd6cfbc0744137c845d4b571e30828dc1b2a06d79de0c626f752e982498f956e7ba2039c SHA512 d7b0ff6b26d2f78fb895db4be8b9b0715dde84b114aeb195d6239a7edeb86aff118988ff21f63c70a570959e0148336aff251ff82bc528ca2937ab68b557b2bb
+DIST opera-beta_55.0.2994.20_amd64.deb 56266674 BLAKE2B a8198ecf4c9086f8e50f027256a380e3a97760cc47a8a54c3975cdff08374330fba35e77f03a9b0293cf1932cc98201f876974b59421bfb1c3c4a682d8ff1742 SHA512 607942e2cfa31c98c503077d827c74122e7ac8540500f89f72e1aff613c1b21abc260defb6ef6bcf31437e13fe98dd2b97537a4f81040d80f9d2c519f3c40e41
+EBUILD opera-beta-55.0.2994.14.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+EBUILD opera-beta-55.0.2994.20.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-54.0.2952.40.ebuild b/www-client/opera-beta/opera-beta-55.0.2994.14.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-54.0.2952.40.ebuild
+++ b/www-client/opera-beta/opera-beta-55.0.2994.14.ebuild
diff --git a/www-client/opera-beta/opera-beta-54.0.2952.43.ebuild b/www-client/opera-beta/opera-beta-55.0.2994.20.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-54.0.2952.43.ebuild
+++ b/www-client/opera-beta/opera-beta-55.0.2994.20.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 0b2d10f558d2..623e670eb857 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_55.0.2991.0_amd64.deb 56130074 BLAKE2B f86b8da08bbda2060e95cda7523aad39ea1a64b82a67c196024643550ceaf163af8ffd28e722427803bfa1411b0cef1303193a896e77f8900fb3980672cf42f5 SHA512 d3d427fae872a268f0944ac672fafaf166aa774f13b3b8dba1c4f41ab1e7eb2d683d11fbd5ea0adae34a2d2b79b406cb5157b9842dc9e1ca5f5a1959a8095932
 DIST opera-developer_56.0.3003.0_amd64.deb 56650698 BLAKE2B efdaeb3e5c34307e863bb8ba8140461e9c3ce279c90d3c4dfea0e22e858462740830e8b46d716fbd7d968c57d3238a7a059b6a12193bce45d83ebc2523c0212b SHA512 a5ac2ef9302790863501f8a793c4e73a2455219b30dc76a495ff74465e25eed0ceb817d00fa4f9e17c0df152dff0394693b4e98fdba453f5e761824ef7ea4c36
-EBUILD opera-developer-55.0.2991.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_56.0.3013.0_amd64.deb 57274790 BLAKE2B 17fe597401c6068b4ebb6810b9cd5ae9c2356a6fe18853b2d64706ec499cf47bd31b7bb0d67c5b902af9e49b524c43b5c559237b846183a7c2eaef9399b681b3 SHA512 5e756e0fae127e8232d9f1bfa48447aa768089b3a7d411478b399bf850fec5918f3078e9e18cfe404d177fae43bc4b2882ecbbafcaf8b2e2e0b65dbf72ef3d06
 EBUILD opera-developer-56.0.3003.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-56.0.3013.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-55.0.2991.0.ebuild b/www-client/opera-developer/opera-developer-56.0.3013.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-55.0.2991.0.ebuild
+++ b/www-client/opera-developer/opera-developer-56.0.3013.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 528953027429..f3811cf3e2f0 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_54.0.2952.46_amd64.deb 55502514 BLAKE2B 85831f94f7cd5ba2fb62c3d916644839b1fabeb4a251e3b87cd1123bb8a3176958d090c5f6e8b13cedc2a9dab72b98ab88974e71227ae25ca9e5763d60dbfbe3 SHA512 d7840c02988f06d3f92e6c4c332a5f2cde012644d01bc925fa0a108cf2f0cfd5a85377396b8378ae2590a295b93610903874bc458df2ef1306ede9e89dd9146b
-DIST opera-stable_54.0.2952.51_amd64.deb 55848686 BLAKE2B 4a26a16bb5a1fbf1f12e4ee3b3b347a4da6eb13d10866ecd5d1d908a352d73a376df40070f98046e412b522b59f4877591a78c0b931bc62672349e060a713da5 SHA512 2905808f54604f11c195d808928928dbb733a4a570f033dcb0164b5117620d5835afcf7da6c3345cd3d5afe48b6a997bf2d81588bb4afdbdeb129066dd643251
+DIST opera-stable_54.0.2952.54_amd64.deb 55053230 BLAKE2B a998158fa624af7d439872c11a96da80566bcd48e6b1e2c7c8293fbe4c9f5495025bf741bf2e77b44115d7ff154e4f8924f5e629346fe0a1f19ee1e2d90d613d SHA512 76887484841f2eb0669d6c12d0ce80092b6a903a0244c3eb2d17d4530fc0abb94c752d215c86fce5f67469b089214527bc5e1f62770bfb1e64d5e6e0c36e0e4a
+DIST opera-stable_54.0.2952.60_amd64.deb 55845302 BLAKE2B b7b8ea124dc50da1b9bac33aa9aca9e672a54ddbffd5257d31984951af5d8f9587f86699a6969c9594e7f8e6e6a11b4e26e92dc6203d9f8fec1ba6eae0db7597 SHA512 e650f202fed6bf962bc3f94aad3eadcf5cfb9a82a6588263d4cf4bec5e4ce3a798aab0be1692c385579964031785fb4875528be803aa8dd93ca8eaecc22812e6
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-54.0.2952.46.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
-EBUILD opera-54.0.2952.51.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-54.0.2952.54.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-54.0.2952.60.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-54.0.2952.46.ebuild b/www-client/opera/opera-54.0.2952.54.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-54.0.2952.46.ebuild
+++ b/www-client/opera/opera-54.0.2952.54.ebuild
diff --git a/www-client/opera/opera-54.0.2952.51.ebuild b/www-client/opera/opera-54.0.2952.60.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-54.0.2952.51.ebuild
+++ b/www-client/opera/opera-54.0.2952.60.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 09f174cb7267..faa473b577a8 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,10 +1,9 @@
-AUX vivaldi-1.14.1077.45_p1-libffmpeg.patch 567 BLAKE2B b26ad49c8d4336e572ca4fc4ffb1b90240b0b9d568e48706965fafdfd5681014e33fe0ee418ebde8cbfd55d840bf5ddb1a3e6baa8f69acc92255bfdfee8811ec SHA512 02bafb3edb17cab08b72629a17de772b097883ae132e36c8ccff2d03ef6bc861cba968e746379db612d0f012b81314f19a2a2f90f1b4af4c5cf67e048eeeb9ef
-DIST vivaldi-1.15.1147.47_p1-amd64.deb 52835714 BLAKE2B eae1baf7199bd308c3a3e82526dc9e9347129225ae9f8fbb1a77e46bdcda4b03148e2ce94195ff53d74ec04048686b3754951194eb1c224fca655f45aaad2a2d SHA512 eac2c37228fb1054b3abc286c6b415812f360fd6e02ebc5775992147f8deb51f4f81026e5090f913776f789cee9da4b40f839b909edb67f24d412e2703da6adc
-DIST vivaldi-1.15.1147.47_p1-armhf.deb 46838822 BLAKE2B 0e7287782eb8eae4ffd1d43538facd126d5814d0f78bd5f0787613edeb9710a6420c3f11a1e63bd876122bf448c92d312f986a62ebfbc3ccc451dc09dc249e89 SHA512 b05ab74cff9eee8c6cd85104c6fabc5937fd7f76d5f7af4897711dd4c7b74ff88b22004de9792a7bf2ba40f1f193b33302d2762dfc2086fedb41a49f5ca32b13
-DIST vivaldi-1.15.1147.47_p1-i386.deb 52488994 BLAKE2B 2433330782f45f00c0b5b85eedeb731318844521d0c2f8642d157599118818e773e1388399fd692ebe775c6faa9607268d72f85c00e5590f4c4e60006925e98e SHA512 121b9fcb4f102cdb4a96d6407114c07d914f2d5251e47ff0be3caf2e12c53e37dd367ee66ace2e313633117443cd05ccb376e51e6552960548431517dc8bc4bd
 DIST vivaldi-1.15.1147.52_p1-amd64.deb 52873960 BLAKE2B 2339c66888dae4754fb9ea8bf1cb84297a7b0bfdf60cfcd2f348fc7cfdea65d112f53fc65df59cf56d979bb6b508556de0e9d97488e6107e2de22bc00957638b SHA512 c999eeda13cc4855103b303cdcd4d0411d55ac726f8415a5ae9c395a949a3cbf59826bbffaea27b3a85cc24cc58a1a1b24b48687e826d7a28e392da9df5b57db
 DIST vivaldi-1.15.1147.52_p1-armhf.deb 46843430 BLAKE2B 9d6d7dfc4357c1d057bcd1e04984dcf6f4c1a7132e69f5ddb88c59bb0790e9a48c269b17cb3dd16ee0e1195bbd8d3dba31819b76cbbd2b551fc2077596360c97 SHA512 f16ecd1be10cffe486f71c857e4e9ae8f6f3da48778260ddd4f3a5736b5ac772fc1dff4f23ef40a463d3fab72c276df0e7019f18e781aa1cc9a914afa18095cf
 DIST vivaldi-1.15.1147.52_p1-i386.deb 52486988 BLAKE2B 17b32ff290880683775dbc724bd6a9703f1bfd7b37d1199519ffb3d01e75a1fe58d842341660baf5d0e7818bf5e76bad78ae498670ba3aeefa4d883125c39b87 SHA512 b05ae7569c149b764c253b80c58eb60672ac3b28d368d1012bb339b771acd074011b2a1a12a8fbb9e58fdfb1173dca97de1f5e7f1243985e638db63ab48c7aa4
-EBUILD vivaldi-1.15.1147.47_p1.ebuild 2931 BLAKE2B c58af68c3e4e846b68683d195e75793f6644fe8f17e8ae3f8c285de8324d4f3ba9d2d202c875a1a21df2c4df2d9565715b0280e7ef658d92dfccd088b5768e25 SHA512 1cec9384dfb1bae746b8eba01aef382b4c54d06cbf2d8016b480b655040e10ca05c629c4c9628e70cffbed586fa925689cea5a7d2018bc31a85045dcf55159f0
-EBUILD vivaldi-1.15.1147.52_p1.ebuild 2872 BLAKE2B 56a6d7d2d976c6b8e749647fe6b1170a136cf944f256444776cfc04e116c05aaa65b54770c265ef57889ff0aa18db3507d11576b024f0bbb930fe408f09e3140 SHA512 db45f668d8b0033ae21469ed027cfe9af6e409cfdcb5fcca33e20dae2c29d394668169d66a6f857c83fe317786832734ddcaef28f58863ef2feada1160b6d585
+DIST vivaldi-1.15.1147.55_p1-amd64.deb 52880244 BLAKE2B 5bfcc57713a586b7534bbc2be88c4ade155d6af15be4b9626b73b3b9ecbd90cfaefd53fce5865a8c1eea863dcdd64c8e2f3118705294b7b0a4911055b1da698a SHA512 0d9e2971bd471e4a4e045421dde6eb1bd3431e0d843ae806e8068c75a8f5137e24367eb708201ae2f9ba127045462061632fe43660f193a6e0c3cbbe0728b8de
+DIST vivaldi-1.15.1147.55_p1-armhf.deb 46831370 BLAKE2B a9f61c8ce04921884f418a1ec708fd9011ddf7521a9dc23f44f6b93bbb2356a40b705e1add1ba527d437512b3482749e7eb4e2703786af988091e6f45ce2e3f8 SHA512 7dbcfdd12b51cbf1849933e1104fac69f8cafbef8bc78d4776dca030809ca321c4fd12733f1a176d527fd89cf128010f5a282637917c12d99ce4bb8c4808d04d
+DIST vivaldi-1.15.1147.55_p1-i386.deb 52490106 BLAKE2B 4437ae3263286477da9507393c93f502c63d3ccbba223ca3b702407ea1e3a79a165790505f8f25a319e1b8c0c6beec2fc1ef1a2e0d67ce73dc8e532b136c063f SHA512 ed42481a1db6d6bf163ba3c2e2cbe6a90eefa730b93d2f2122502cceadf0ea601ef48d687bfd63a87c57be930d986b92da2ac3afa7340ca1bfa3346ee840c24e
+EBUILD vivaldi-1.15.1147.52_p1.ebuild 2870 BLAKE2B fc9de8b2fe9abd757136231329e48dd936dc0330e87af8b97ffc40443a8b130d39eba9a025fd01f4903eb851203cf2ff15aab8cb7f93cc2b7be516f57de55243 SHA512 9e0c40988d5713e4403ef273d0d627480da23e26f1ff3f008f3681ba72a3e5244b5de409b4868d3687310a7b36dfb320d7f3bd2501de1b7bc33e152aeb62154e
+EBUILD vivaldi-1.15.1147.55_p1.ebuild 2872 BLAKE2B 56a6d7d2d976c6b8e749647fe6b1170a136cf944f256444776cfc04e116c05aaa65b54770c265ef57889ff0aa18db3507d11576b024f0bbb930fe408f09e3140 SHA512 db45f668d8b0033ae21469ed027cfe9af6e409cfdcb5fcca33e20dae2c29d394668169d66a6f857c83fe317786832734ddcaef28f58863ef2feada1160b6d585
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch
deleted file mode 100644
index ec398141a793..000000000000
--- a/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/opt/vivaldi/vivaldi
-+++ b/opt/vivaldi/vivaldi
-@@ -54,6 +54,7 @@
- # Check for libs in preferred order.
- # Where possible, use other files/directories to confirm it's the correct variant.
- VIVALDI_FFMPEG_FOUND=NO
-+checkffmpeg '/usr/lib64/chromium/libffmpeg.so'
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- checkffmpeg '/usr/lib64/chromium-ffmpeg-extra/libffmpeg.so' '/usr/share/doc/packages/chromium-ffmpeg-extra'
diff --git a/www-client/vivaldi/vivaldi-1.15.1147.52_p1.ebuild b/www-client/vivaldi/vivaldi-1.15.1147.52_p1.ebuild
index 6792e850ebb4..954c59a1a8d7 100644
--- a/www-client/vivaldi/vivaldi-1.15.1147.52_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.15.1147.52_p1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-client/vivaldi/vivaldi-1.15.1147.47_p1.ebuild b/www-client/vivaldi/vivaldi-1.15.1147.55_p1.ebuild
index 142fc99ee0f7..6792e850ebb4 100644
--- a/www-client/vivaldi/vivaldi-1.15.1147.47_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.15.1147.55_p1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
+KEYWORDS="-* ~amd64 ~arm ~x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
@@ -100,8 +100,6 @@ src_prepare() {
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
-	epatch "${FILESDIR}"/${PN}-1.14.1077.45_p1-libffmpeg.patch
-
 	epatch_user
 }