gentoo resync : 22.04.2018

14 files changed, 723 insertions, 22 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 58d0a4ac599b..c662f9ff24aa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3f6727f6f6b2..36ec79e02e93 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,11 +15,14 @@ AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab5
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41b607ea7f1bca12b43f80f3fffd562bb85af5b298725beca2ac3e3a31297537c2d485912eda3996ab56c45bf8e113cc7ebf764 SHA512 e8227325c0128e6c476006aaba97db24b7458de56fb47a26c5880564b730d6e3c130945bfa1e8f664a270b8f22dc25869633d42860c2a9ac684e37325802fbf5
 DIST chromium-65.0.3325.181.tar.xz 570386836 BLAKE2B e170c80dc59ccf84c08430d9685f2d491f609d6217cfea4e0618622dbf53722e9803a41df4e922446be90d8ae70229b3b8bb9a86e9a5fd21a7986aee4665866c SHA512 52472127b46da48699f401ab9c64f80975398bc3e97d032c517736babc327bfa0a0ce6415831ff3f585cd309e2e05e48d5252b15d0873fee118adf70f54d1a05
+DIST chromium-66.0.3359.117-blink.tar.xz 10604 BLAKE2B f458afe8ca21dbae62037cf9b962726a0b48177bcd209ca15eb2a717ca33307ab631e85422fce8bc5990e8f78ee30dd5b58d972eae4cc511f593ee82227ec2b3 SHA512 846ed1ecaa51d945057d0a9f6a72e1dd871a9556fd1a8ff79a5b9e342363d6a2d60378dbc0e84046e7274f9d09dd2d9b444a76af7fc25e7a2869c15c858606d3
+DIST chromium-66.0.3359.117.tar.xz 583947452 BLAKE2B b9e860f0f966ec9aaa2ab5627bbc12486a67b658866763f82d1687cb6cd5ae0cf8b2ccfa3bf045417688a771d7662ba2f8ba149b88802ab3f54015e14ceb7fec SHA512 93fba91783a2109a74fcf7fb0a70a1e1eb062d9277a78783832230638a3371e35fa725494989236c5e5be5494548c4869e1b2e645c65f794a7296efeef8eb27c
 DIST chromium-66.0.3359.45.tar.xz 583703472 BLAKE2B 6ebbc83c870889319b99ba33f0416e2ce5988955890c579b1df38da3bd6938aa0d158c65a574ea48d3a34a2f87f7982f35a9280b017f8471c6ac837e2689303a SHA512 be32c4ab8db1e8d1e2581f015fdbe12ee4c734b77611511c53a5279114ba4d5d4d1dfe9fb1385bea587b530d6551491db70b275615a96fe86e5a525512fc6d73
 DIST chromium-66.0.3359.66.tar.xz 583883464 BLAKE2B af59a0e7296c5d3db02187da79b99cd2eabf4c2cdc04223bca40590529c5dbad3332b1896ebae4a3e99b8e451786adf8300570c074c28126251212bf880c588a SHA512 25f9e897f5fdc2f7dbc3cf3e9f4f135199f1c68ea41f167f94be1018fd337707dfe281ca7774a45d1f03f6a6c9a148bb51be4491b006331dd4f99a4836ce69d1
 DIST chromium-67.0.3377.1.tar.xz 585310180 BLAKE2B 9e543ad2796c617e9c6237a938600ddd4fd7f7245f78e7aec25e2160ed8ab128e70c97d5a7d70021fd7b79707ceaf1e5e0a836e25474ad5e2999bc1f6b7e43b1 SHA512 e0e5c092895d676551ad75cf18595a641676cde0a6a414180a7e23046cb47fe61256634ac50fa6b3f05153a75125e88417bada12f662ee3fa71aad3ba7cf7684
 EBUILD chromium-65.0.3325.146.ebuild 20899 BLAKE2B 3694430361ce7b8f6a2db0e6a3be5654136174dfad1faf155fe326eefdf1186eeaafdcb27c47018919e91ffbc48237311f880c0b8250358dcccad7b22588dd6c SHA512 08e0737062d30a800e4e8a21b0a715a8610ef49d30040e034ff37c26b53fa48b8ff5544f6e3a8ca4b41bd3738928210ad09bbbbb5dbe7c47e22f1bd98cb6fe3b
 EBUILD chromium-65.0.3325.181.ebuild 20900 BLAKE2B d93ddc7aa2b11928b47fb508950642f89b4f0b94bb6f6ad6e516cdce42e68b7346cd6095337632e8a15d946d1da6af10be36ac0b23766d04b02fe78de5747a3c SHA512 06453fef8284858d4273f20c30142cc78fd2d047ffb4b9a4444ef93caee07918eb0d6f4b64c95ad71a20228ee561d1256c7b7a9c66e2e49dfeecbeeed5ea4b02
+EBUILD chromium-66.0.3359.117.ebuild 21111 BLAKE2B 2869456ce0fc3e735f09c35d9d28ba22a13f2e511ddbe0cc69d0db0171e46ed15322e81288d197df65b247f23ec3a4b2ba64d16ad0ce150563c0591385effb70 SHA512 c025e0ec4279871e5d1354606228c43b6a5f6e37407a88407907b5b72b9a298acd632a5193f447231139b2634370968dfdc5f0bbd585e04740a936d3bccf812e
 EBUILD chromium-66.0.3359.45.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530
 EBUILD chromium-66.0.3359.66.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530
 EBUILD chromium-67.0.3377.1.ebuild 20722 BLAKE2B 212e18f41c38fa0bb4cb31e23d0302a1111a16e686e323a6dd08bd7aa2fd10585e78ba0a42689d4d5a77b97727c6bcccf2fbad5776797dc5ec9b472a01a7ed24 SHA512 9c64befd569134d02f036f35e2bc146f88ba00ec5843d2faddf5354d31f0661847744bdb79d4a14747a307e57bed6a181c243bf163a3c16ce57ad2d96be6d7b1
diff --git a/www-client/chromium/chromium-66.0.3359.117.ebuild b/www-client/chromium/chromium-66.0.3359.117.ebuild
new file mode 100644
index 000000000000..371848a0ee28
--- /dev/null
+++ b/www-client/chromium/chromium-66.0.3359.117.ebuild
@@ -0,0 +1,700 @@
+# 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
+	https://dev.gentoo.org/~floppym/dist/${P}-blink.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-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-clang-r4.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/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/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/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
+
+	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
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 12c22f955dab..6c039021976f 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -4,6 +4,6 @@ DIST httrack-3.49.1.tar.gz 1835077 BLAKE2B e628ebfa7d789e527e8cdf6d63c6639c26c0f
 DIST httrack-3.49.2.tar.gz 1835116 BLAKE2B 4073b70268bcea8acf0a9ac10deed14764ccd405c82f1b9f48dc74d3dbef130161234b59e70e72305a195d21155474831e8359eea9b96d275481a69b1c1ff561 SHA512 84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8
 EBUILD httrack-3.48.21-r1.ebuild 1118 BLAKE2B 7448e24d5939bebf92c8b70655fb8628cc1228751234f4b11f90b4bac123738be10f290547d7d7c98d2b490d98122cd7d7eed5c9f52beafb4c62f02a51825e0c SHA512 a942faf92d5e5451858f76a3eec1091a1391ffb3b805f20ea21b1a5c51b0bef03fefe968471c66f442dd7a99be3c9ab8f1fe5e558e99831e3451273c9a43a1c6
 EBUILD httrack-3.48.21-r2.ebuild 1200 BLAKE2B 91f0906ec540a84f00c53f89ad5c9cf01447ec8e42de4c9ce0921853e7e2fd0de3dbbddea302800dbe6163ee986fbd06b2932bd8c349f541d90cdabe00234fd7 SHA512 bf53c8d9073dd0a36c9455b62eed423df50730e91bf77aaa0f617578253549398c277841882ca9c98b2c56ca13bbbf1d71e498a2b4237bc71db6cea1065eb222
-EBUILD httrack-3.49.1.ebuild 1213 BLAKE2B 401091a57aedad733d7c2a86093c9fbcaf588aa93aecef9312ec11461b8ac404604f8c71d13d43d6817dca343f6177c78af28fe51a53971e695331f766207626 SHA512 3a9badc7819d7c34f63da110c2482ff2f9a2caabc26b4c9645b11999097a8ab2f3a71358dc9079d1f8a51f88541870033e79f1f203a4b27f0c69838befd866f2
-EBUILD httrack-3.49.2-r1.ebuild 1193 BLAKE2B 5fe93da1b70deca539827ad834ee1825cbe35041599d6dc48898a0074ba7018542c0635f9272692e3f7c28310f7a94a77d162c00d9177d61d1dbfdd5e879afe8 SHA512 0e92eb7539370e7a56401d5a763bf65351b61db0f1fcf7fe338f791ae618e256dbe4367b93582efc6e0ebfd1b018dcddbf675a865323db60b56eb14661e475a3
+EBUILD httrack-3.49.1.ebuild 1187 BLAKE2B d56f6803499aef518b5cd7fd44e23ae714053978704dfe5ebc79f821db174d65f9d11eb7b6892ed045d1a22621cb50d0d740f37a4b8782df365dea9e643af5e9 SHA512 8e0a564dfff730f6ef1722986bc7202eb5ff678dd9d4f2ec7ad9a8195e9021ec8e716d485a39fbd2f28eb192255f705ba4a19e37677371e863d5256aa9810ab2
+EBUILD httrack-3.49.2-r1.ebuild 1167 BLAKE2B 585ae557ba26d51a2a6a30d84e3ebcece2672172a2329dbe087b07b5c237c79f0c55323b863483fc8cdaf3ecf5502d9c03a7cffa856beec5ef938b035ed81a64 SHA512 cf296df2dd797ff6f8e8f38348e24771a5a810d781c1579c3e6539f2a56777cf69de521cdf8689fe221e3ce9deb9ac2e88e3ff19543a50e3cb4b25cfcdc798a4
 MISC metadata.xml 213 BLAKE2B 89a7efa56dbdbb38950f944228541e36e90e427e1171bc1cc9103ebbfc435786bc60e2bc2e48a6f73a70ae9d8414a5748fbf8aa18476815a5a8b4c43bca0119e SHA512 54084c6097a56011194ffb5fcd237adaf6f2940fb41136bda541f0fb3c4301c87a553fa49b03a36865d7ce911f96e70349f0b40e3828d2edbcbf0d02472ba446
diff --git a/www-client/httrack/httrack-3.49.1.ebuild b/www-client/httrack/httrack-3.49.1.ebuild
index 4018cd13894d..e4b6f51a159c 100644
--- a/www-client/httrack/httrack-3.49.1.ebuild
+++ b/www-client/httrack/httrack-3.49.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -22,10 +22,9 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.48.13-minizip.patch
+)
 
 src_configure() {
 	econf $(use_enable static-libs static) \
diff --git a/www-client/httrack/httrack-3.49.2-r1.ebuild b/www-client/httrack/httrack-3.49.2-r1.ebuild
index c3d92855583d..746cc70c8f25 100644
--- a/www-client/httrack/httrack-3.49.2-r1.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -22,10 +22,9 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.48.13-minizip.patch
+)
 
 src_configure() {
 	econf $(use_enable static-libs static) \
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index e73e10fb6b96..a1eb28c1fdb3 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 2596 BLAKE2B 0226dbb3e3322d49700f15c4dbe936a806508483f5af4fc2512faeaccb97135cf1bac98ee42cb27fb4f608def22dfcdc30792ad59b4c4fb20feb114f725b79d2 SHA512 e3f6d3dfc8efc53545435eecf77236a84360a71924031c34bbca8548f7523e4645aa2ff81380c5a9d011f4d4c21e397ac4ad15d358d2a29cb74ffcde5747bfda
+EBUILD lynx-2.8.9_pre16.ebuild 2595 BLAKE2B d522547865f2f49ea9d2dbdd1e223c0b17dc0b43711ec1ba92b9ea1f2859c9c56513a838d1781b762f8cc85dd5378985514faf5530fcecad93b310f25e4139da SHA512 8e4e4c0fff851dd414963fd0234bc7494fae8b6c14b6d63b115e29c9e054922efaa9b3ae793654745b0ee9b425820c1767c0d2c033d59c96cac67a7dc611c2d4
 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 2e47a85b23cf..291bbdf045b6 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 512006b45767..be5f82840ac9 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
 DIST opera-beta_53.0.2907.14_amd64.deb 54905438 BLAKE2B 6fa96cddec60943a0c228e635e5d07c3ae620d497fc10d1d4897cf25aab02566bdb1fc4bf43301928e218e2b02c9fb4a7806628d94d578d5a50750788f14e23a SHA512 89e357403324c489619ed8fe55688c6a589cae107a35b458df85cdfe44de8778dc4a8cf4efcb1f566d5362054b3afa3afac307cb71f80766a0d0598e6640ae5b
-DIST opera-beta_53.0.2907.7_amd64.deb 54555576 BLAKE2B bd8192092ba0c950d4251a695149ab61c32122fc5ab0ed188a4d6fa1e88cc24d47328bd4f25394be7b165b448a2d8941533a7ff6e1cf5772ab7913ca30a32eda SHA512 97dcef04b387af91efffaffb1f0aec1f93e312433f6ca486f07bdaac835ecfa3c4be8bc14ead0385a5d1821971b3aeda07cda43cc845804634b27c15a980d60b
+DIST opera-beta_53.0.2907.21_amd64.deb 54899728 BLAKE2B b6c7862f51b9e431a2583c79f047d1f69ea6deedf9f1b2895a133411a212e9a0a70f742b048cfb7ae72663b974eda864f82210ada172d99d7a46ccf5c7b313b7 SHA512 d2e74cc5cd2ace74148e5f5cb12b1f7f01fb4defe740ceadc14d89dfb7ebd5f9f2eb02b21b2da0da91bf30b7bf5398c1408440efa38a33669fdbf3a61689b7e9
 EBUILD opera-beta-53.0.2907.14.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
-EBUILD opera-beta-53.0.2907.7.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+EBUILD opera-beta-53.0.2907.21.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-53.0.2907.7.ebuild b/www-client/opera-beta/opera-beta-53.0.2907.21.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-53.0.2907.7.ebuild
+++ b/www-client/opera-beta/opera-beta-53.0.2907.21.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index f0481e4d93c7..a20498706349 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_54.0.2913.0_amd64.deb 54606726 BLAKE2B 23ca3f0066f934ce5699192a5b8c2ff226c5aa50e80235f2d8710141ecc0375dd766ce93b56e317663d5b64d87d0ff6753670879fcf593f44b783729682a9c57 SHA512 896c06f64a228378a73297995923a5c57b161d5ee13c25328eea81a76888e3fc6fb10add063d3d1d8888a0f75f745910acc073712c70d2bc958745f078931177
 DIST opera-developer_54.0.2920.0_amd64.deb 54792622 BLAKE2B 0f53613ac96be1d6b4bdce9fbaf05abd2ba76bc5ae9216ce3b830cff4ee800e8396503ac3524596c72e9351df14aaf8285d2fbef82e32bb50ce731f09201c9a9 SHA512 f90703ea6d2472d03ff2f96124b74b7165d30257ad2c8c3ab19a6af701197d7258f1a8c84cd266061052d4ba75ae6d09dce8e3701e257bd756fdd4685697a535
-EBUILD opera-developer-54.0.2913.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_54.0.2929.0_amd64.deb 55440718 BLAKE2B ecc20106b19d4ce687dc525b536adfcf4b8bb9bdab26791fc28eaa9e68d3b8b58df4ba7c42d5caefeb9ab1bb4062e08b60ccadb3bad837a393e1290a5ea4667a SHA512 5a3dbdac8fa4578db6e37f9d2f0ef30cd6fea7195a25d736572195a9cdd4a818ab0cfc47605b835ce2db32c0ada09ccc25c13698ba0d9bd46a85470a5de5b6ca
 EBUILD opera-developer-54.0.2920.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-54.0.2929.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-54.0.2913.0.ebuild b/www-client/opera-developer/opera-developer-54.0.2929.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-54.0.2913.0.ebuild
+++ b/www-client/opera-developer/opera-developer-54.0.2929.0.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index a2258a188113..45822ec4162f 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9
-DIST vivaldi-snapshot-1.15.1147.21_p1-amd64.deb 53867028 BLAKE2B a55ccae5b2bf9efd70c58f6febbc690c5867d5a94ea195a10111fa2b3ea2eb8172b2283cb59c9cd409a18f2537b3a474ef8004305f3ae6d966669b801d83f6c4 SHA512 42918da73a53d7488da3c9b65d970b29e848e0d35334deeaa36c331a35e8c0e0293fff2412153f1c7290cf2636075d8a49fed9a0051711c6e74a23d45068544e
-DIST vivaldi-snapshot-1.15.1147.21_p1-armhf.deb 47687784 BLAKE2B d7d68474cfd8d446ac999972208d6eb7b52d0d4d1393e847d0f29f0bc307f304567ad731184a2291cef5b274f5d38f8d6e94207f9566942af9de395a9d877d2f SHA512 33c5e6a2a3aeecc77a7d9c2d03ff6d3b584ca79ad71a5d6a14bc334e6a9f114a0ad93b15441a1d1bdf17c175f13df4f4e9aa6d308f2dfd73cb691283af876f0b
-DIST vivaldi-snapshot-1.15.1147.21_p1-i386.deb 53511430 BLAKE2B 8560b61e8f966f42b33799aec75106581ae3cc0ff3f82fd2a46bcf84f55bed65f03c9ba13238e421896ce2162460264bc8df391e660dd0c0fb8c229d41516c41 SHA512 3c1002e67e42cfa49d82a48132261856ff023211d0e204d7787a0faa331a6fb4154078dd31e97119e1bfaba193668dd0454ad1778dfcb853a71788691c92e7d8
 DIST vivaldi-snapshot-1.15.1147.23_p1-amd64.deb 53857072 BLAKE2B 22bfe94f00d508bd03bbaadfb6e895a089443465f5abafe2347dee0877a52c4650f6933b15e10e768896c078db2584d1d8781c01dda2b99fcd98f90ddbe12138 SHA512 e259586b2084c29c9db110af7f3154777e47bb3d226740a8557df42cd931ac0093b56b515765467a8a6b8ccc685a1f7e1e0e01a783a2133b42f35c08f1b3900c
 DIST vivaldi-snapshot-1.15.1147.23_p1-armhf.deb 47686074 BLAKE2B 45f568e107ff5a52cc84b12d745ae6edd76de1cead0cdc16a922cc9e43173b1848bda9f1b9af68b978e5b6b3e18325674d9947d9ac0038d37d065c66cbeb1b0a SHA512 51ea75d6dfa2417d030d19de8eee1002d6594352759c056bf84a3e0dcab702e50c185663924a9fc9b91fa8c9c6fb72b6aef0426c88b7c4abd26031e7b6d86172
 DIST vivaldi-snapshot-1.15.1147.23_p1-i386.deb 53515616 BLAKE2B 34a81f65e35e732a7ac14025940686068c47aa777f79d65e05fad827eff837549cd3c96514c75af30b9277d900020f2d35600efc30b3d9ec5664a3bfed878ccc SHA512 4bd0cd3d7ee1315b959cea4aa5fa4b8b68ec7655d63431acba41edc1f59b6c6f5b1c85be8f981231420b508d16507ceb85238d0602910ec796ebdd8440ccc780
-EBUILD vivaldi-snapshot-1.15.1147.21_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
+DIST vivaldi-snapshot-1.15.1147.29_p1-amd64.deb 53970214 BLAKE2B f19df57c8aa2b804774245248aa67cea78b4a25356468e838834bc47a52a9f37cb4214b51cc884ce7dd8e998f598a771037ce5e81dabc4c2060bbdc9fa579965 SHA512 cd596222005e85bb05e550dcca19a5c4fb5edaea18234757cdafb4b896800504a5d63344f1b598001eb7ec517013ebb19dee9825a481ff5a6a7050610c02c151
+DIST vivaldi-snapshot-1.15.1147.29_p1-armhf.deb 47706408 BLAKE2B 1911d890a73cbdd591b0f8f0c8279c9dc4ca958662c84de69326bf00b9b61c9dd35014e28429eaba914efbf963bb6885b640f399d81ebe6978e55be610770902 SHA512 4d3e1ad4d20d83b06d964cabc0098c8ed864d40b4867a56621500b33b28eaaf2c56813e17d8d4764b542d76faf06af5dc01d44341d3cde574b31946837856a65
+DIST vivaldi-snapshot-1.15.1147.29_p1-i386.deb 53522702 BLAKE2B bc0a0660c9af23f790f13b6806f2559b8cd45748de8e387a81906e1361e7ff382b3fa1a33ea278704dfd5b012a418e1d26246cdae61a2537e970630523ec21d7 SHA512 2387cd8cde710d7dc3c728e8e249770b2f245a805d99517bb7b8b0fd41462ea56b82c0dc43acfb43f758e1595167e08e98dc9d8abd2bee5f41da06837b079ab7
 EBUILD vivaldi-snapshot-1.15.1147.23_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
+EBUILD vivaldi-snapshot-1.15.1147.29_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1147.21_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1147.29_p1.ebuild
index 03b567d27a1f..03b567d27a1f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1147.21_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1147.29_p1.ebuild