12 files changed, 8 insertions, 953 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fc556d94865b..74de083582f9 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,12 +19,10 @@ AUX chromium-webrtc-r0.patch 972 SHA256 bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd
 AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b482856030f43fd56273bb4f0bbc319d158 SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a WHIRLPOOL 2d2ff0b11c3062ef4c4873221d986dcd6018130d687d487cd32e4912e957332e12165114a69e8e86919338cfac2ad61dd521637fe4be6d7b3b3deed21b008365
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX toolchain/BUILD.gn 799 SHA256 7b42f63ac928b7d1ff8e4d91cc620e944d581beb26c64fe7e1560f10a9c5ad94 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d WHIRLPOOL 7d9b145da023b223eaf0a9c6907a42ece9f880b83abcc4ef45624436901bc21fefe5f4823e67350a07b60e2ea4718ee4bf21542264fd2c7d1f6ba6b8cbc3daa0
-DIST chromium-62.0.3202.75.tar.xz 517136048 SHA256 49cdfe457bcb941b56c13a75bbe2ff394fcb5baa8a49c9b470835fad60dd904c SHA512 1108ac0b383ac654b5b6fb42faee76621d3c476fcf1b6469f498023be7272668f46f7081f74b2a4079ff45dc3c77b225cea7758a11677b0ba5a478e1d8bac87b WHIRLPOOL 0bcb844ec55469ff293672e075dc8bbf4b93809048fc8e5235334dea06e087c91286ba023831ac5254b27241146a06fd33360ef540f6a37cd7092763cc55ab09
 DIST chromium-62.0.3202.89.tar.xz 517100784 SHA256 9f79760dc22f7183602a07af3d37d2226bd63ab0ca7163d88ac0d81982de9469 SHA512 11ed71d2c9ebf82c9b704111d85d01c5600fc1caeb66e0dfaca172b20bb357817d717b3bcc13f704072b77550fa7fa74f990725b1d7d85d4d2b82cc1baec9578 WHIRLPOOL f1a5acf70285df4082cb1527751c65b02b6019b3c5c4c2384f8cdbd50e3255bc66bd8a1080b2e662facbcc111b10089743819a4ea2b88a862d4429cc624b0963
 DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256 97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512 b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3 WHIRLPOOL 1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794
 DIST chromium-63.0.3239.30.tar.xz 561111084 SHA256 ab210326029213eda0290db71f6ddbdf5c42e2d94c3461dee094637a34571219 SHA512 b6b89e3464b4dbef54cfe5971255bf4cf96b8c984a2a82d7f4f66e3aecaf5a0a3c72ad827127223b3448c2c2ffad3fe1b1546266ec9544838b758ac3d9b454c8 WHIRLPOOL 1a673b4060cc757e190ea376bb0cff2e8222c91f30a3627ba39b3fed0c534bced213fa3bba06614aacf2814996fb949bb55bd06d549e74f70af7002aa5796ee7
 DIST chromium-64.0.3253.3.tar.xz 567976356 SHA256 6abe5b8ea147953c9d8bae72e52b4984f1a0f718e97bc578f0250055815ec4cd SHA512 fd0307337eec5513d73c14a0d8bf494d87e1a658c48585afbf7d0c08314297bf28825ee99bbeab95ccaae8a0e5b1536794c3b4c94f996ba0a4a217cdbc224267 WHIRLPOOL 78a44979475fda90087a164a5fa7e082576d344a103536c4c62cc4f1e4d3b6a4681005b9165ff020aff179bd3b58195c518c1fa32fb5f1e7b95548c5ae28e9cb
-EBUILD chromium-62.0.3202.75.ebuild 19510 SHA256 e93b97ee0a97a458be80297ebe6729063603803119235cfa6234a27a27215f48 SHA512 71fb4be5db3cc217630bf2f82ba458038d693981822fef22f104e9f534b332bfea35e2bd72d245c46bb6ce76f816fc13ca8e7cc0426bb1f03d4fa74565b02090 WHIRLPOOL 63f54dbb654b1e3c58eb40029df5e735d94d1472799e959d65ce5fa89fded35fc874312d67207bc3310e9ce11002549e3d69d49fa9ae1af7af9c2727e3f2cd7a
 EBUILD chromium-62.0.3202.89.ebuild 19510 SHA256 e93b97ee0a97a458be80297ebe6729063603803119235cfa6234a27a27215f48 SHA512 71fb4be5db3cc217630bf2f82ba458038d693981822fef22f104e9f534b332bfea35e2bd72d245c46bb6ce76f816fc13ca8e7cc0426bb1f03d4fa74565b02090 WHIRLPOOL 63f54dbb654b1e3c58eb40029df5e735d94d1472799e959d65ce5fa89fded35fc874312d67207bc3310e9ce11002549e3d69d49fa9ae1af7af9c2727e3f2cd7a
 EBUILD chromium-63.0.3230.0.ebuild 19611 SHA256 8123136fa657757dc97e34d1528c8bdeb55be7e932d885ff8e108d2a74465cee SHA512 9104874627988e7d946ac804589399f0e688aa0101da0b00137cc46a3eb15f0b64f09157af8748a93170728672af6e839e2b84b3742d3820956a211f0856ce9c WHIRLPOOL 7ea8ab0400d15fa8721177aef8bc76ad99c08e8a2f4a1ca63fdf99db7b4f744753582663c9dd9fc854878d12906a98a3c1cd10c61e0275a638594c0fec485d9a
 EBUILD chromium-63.0.3239.30.ebuild 19593 SHA256 dcfdff0cd6d149d1976bc9b114714bcc5fdfc720617e12f09323b2560f66a491 SHA512 9736ea5564cc00aae59aeab6c825f57ae159ccffb38876c7561677c1e080c2db827885e160c3590c0fe35c29d8cf36a18e5c32a0b2b33adbf6fa958fbe5c7611 WHIRLPOOL 361db7f07819c72c6ca15872437299dec19613e04913da1aa7debed78f52273f1e7a1a9207535c02f947f663eff51a55bb6f166ce4fbf56d2a1f773e757c5558
diff --git a/www-client/chromium/chromium-62.0.3202.75.ebuild b/www-client/chromium/chromium-62.0.3202.75.ebuild
deleted file mode 100644
index b0de71dabd78..000000000000
--- a/www-client/chromium/chromium-62.0.3202.75.ebuild
+++ /dev/null
@@ -1,653 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts 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-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	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.14.3:=
-	>=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.4.2:=[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
-	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}/${PN}-widevine-r1.patch"
-	"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/${PN}-gcc5-r3.patch"
-	"${FILESDIR}/${PN}-gn-bootstrap-r17.patch"
-	"${FILESDIR}/${PN}-glibc2.26-r1.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	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
-		breakpad/src/third_party/curl
-		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/murmurhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		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/ced
-		third_party/cld_2
-		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/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/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/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() {
-	local myconf_gn=""
-
-	# 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)"
-
-	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 (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
-		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
-
-	# 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_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# 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"
-
-	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
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# 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
-
-	# 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}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local ninja_targets="chrome chromedriver"
-	if use suid; then
-		ninja_targets+=" chrome_sandbox"
-	fi
-
-	# Build mksnapshot and pax-mark it.
-	if tc-is-cross-compiler; then
-		eninja -C out/Release host/mksnapshot || die
-		pax-mark m out/Release/host/mksnapshot
-	else
-		eninja -C out/Release mksnapshot || die
-		pax-mark m out/Release/mksnapshot
-	fi
-
-	# 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 ${ninja_targets} || die
-
-	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
-
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
-
-	newman out/Release/chrome.1 chromium.1
-	newman out/Release/chrome.1 chromium-browser.1
-
-	# 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 7c3b7d5372fb..30cceeca8f86 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,4 +1,4 @@
-DIST google-chrome-beta_63.0.3239.40-1_amd64.deb 18673664 SHA256 4c501e36e90ef9354bcd40dbac8d83cfdfa46ae48735d7f941010f99feb0c8ff SHA512 c2941b6e371c65776f79c45a1973ad580d444126e79ded5c15c0ac8f025107fa27f00bfe0d35d69fd60077d54f94b925a20ef1f97ae6ee90086f4fa13dc0c82e WHIRLPOOL 436926878caebbcad0e0df64226376dc614ace83e130bbfd477e04b3f313f138ab0d7005c96e4ff7853b0abcc6650c8c0c731ad287126d1919baa281cb04eaa9
+DIST google-chrome-beta_63.0.3239.40-1_amd64.deb 49965980 SHA256 206b6603d6891904bc4ea88ddf491e49598c640749fb4f4785e70cfff5eb6d6b SHA512 6a0903d8af56921d3bac60ed0c06fe62f024728e59d7eab7efd3064bb02f702c54b5f4d58c9c85a37db854a7a9aaa9cb9f06b7f6f93bc4eb65af32dad3dc75fb WHIRLPOOL 971bcaed838bf918f3f598143a2c53eec1ad7d86efb2452a78a6b13977b8c124d72dcfdc2d44b765639372d4bb42468301800cb1a7e9b66331b5695117f9d977
 EBUILD google-chrome-beta-63.0.3239.40.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 21904 SHA256 b56029d26bb3007cfc2f52b8d5031881a614b643fcd2b5966ebb050d567a9ff5 SHA512 1fa256503b4ee20b0e8f8b3e3af6a4d1e581fa2050a0199dcce6495960c74e62e5bcc9b37309671889afe7fc4ca443a0e1f21626d653d426b4ed9582792e9e7e WHIRLPOOL 24e45971afcbcf260a68aee5dac7b2db643d139a0552568d39c0e8b7567435fedbb9a8b5a87563bbd24c8dcf9a9c9a25991a24680bb27c4f7bf1e3dbaf6feada
 MISC ChangeLog-2015 18731 SHA256 244ca1dc0c95828216c5a3a9878ee0c1bf6ca757885b8afc39a9cbd11d7477fc SHA512 70b0fe368012d1d3bd0997af71bed3fdb0f3933383ef4c0335238a7f016435f48f03ccd2c2cb432445c3b0dc1b9e6dcd3b687e65c478899b7bae0701bbf250f2 WHIRLPOOL ddb2e222026feb62390eb8bcc07514c1a00a177fada1eed838155637afbf00fa139e5a59e1175bf7157c97a7aecc6a1aff7ae4304d3251c993661da1105f461a
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index cf62d4998a79..857bb82d77e4 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,5 @@
-DIST opera-beta_49.0.2725.23_amd64.deb 51405422 SHA256 df69ee3a7ba658303bcbbb793812129017c270a81d50c90448553ed524252ff2 SHA512 c55688edad0294e00181a4b0fb1475a103cb1fb1d4949a5c029e846d82cde13ee697c90ee7ce7bebdda03ee6b63a4b48413f383d33ddda17b8c941f62bd23a0b WHIRLPOOL 25125d4185f64dbedbcd1d2a5cef23759cacf96b540c94aee38f1c87101738db74e379ee85f022caeb12bed37858559557f1517dcc4350cbc61a2edbf129caba
-DIST opera-beta_49.0.2725.27_amd64.deb 51520734 SHA256 2223449c47bccf6e7320b8bca159ad0c7e6e3f6974b6e348bf9f2793c9c4d5c9 SHA512 feecc11cc940e433b6838582a821a9c1a02d05c4184da7c608e20e05061170caf20dea1b2bfef6fb1144c7e236ba5f6af7471efbade3b8b6a36a7a86a7c3f2e9 WHIRLPOOL ab547c6d651454b25908261b75604e9959304f34af04bf3a7321095c372a8d9c43449392f4fe365f27094875362f82b54642a1604e5b049f60dfded0e6a41713
-DIST opera-beta_49.0.2725.31_amd64.deb 51322734 SHA256 34f85e046a2b018fbbbb8d402602b852757178457f2dd71466895c48a6aeed95 SHA512 755475e5b0a2f3641660c043903404de9e7faf819c657991e80073ae5355669dcdaab84c6d2765d3af088695dfff39820526332c72a04e3680095782537fa66e WHIRLPOOL 2ebfb7d86c20ed31dc56f699ff82d41bfc8ea850e36019b2f4ed7965925137c929fe5aff74e947662c3771801ff0fa69ff4efa48f42cc865fb1354c520065184
-EBUILD opera-beta-49.0.2725.23.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
-EBUILD opera-beta-49.0.2725.27-r1.ebuild 2316 SHA256 4f489cb4f226c90af70201f11ab39a8ecb022424d8390d90467773c66dc332d8 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf WHIRLPOOL b520987a250fe9a55cf98f70518cf4e3544090365826af53fbf68550b00690a318e51f708506d81e46026bffba1bf2d2195c06a1a5413e4a10120a2477e384c2
-EBUILD opera-beta-49.0.2725.31.ebuild 2316 SHA256 4f489cb4f226c90af70201f11ab39a8ecb022424d8390d90467773c66dc332d8 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf WHIRLPOOL b520987a250fe9a55cf98f70518cf4e3544090365826af53fbf68550b00690a318e51f708506d81e46026bffba1bf2d2195c06a1a5413e4a10120a2477e384c2
+DIST opera-beta_50.0.2762.4_amd64.deb 51940270 SHA256 77430f26c34baddc85fd4343aca2442ffccbba00d8b823077cae38979c41704d SHA512 333e3654382f03b348323d8b721d150237f23d8fc61f88ed94f73c7724075a84a1e046cbcb8d7002a1a80b76d32889a978586690255787e186c07edd2f6f5f03 WHIRLPOOL bb7a22a46f4f7d6f35bd67d79e7e7e19f314aa017fd07dc6147841bd4b83d177ed3ad9e3ed2bec1977cf3a9def3887c6d9bd5421dfd2bd75e080576ba96fdd95
+EBUILD opera-beta-50.0.2762.4.ebuild 2316 SHA256 4f489cb4f226c90af70201f11ab39a8ecb022424d8390d90467773c66dc332d8 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf WHIRLPOOL b520987a250fe9a55cf98f70518cf4e3544090365826af53fbf68550b00690a318e51f708506d81e46026bffba1bf2d2195c06a1a5413e4a10120a2477e384c2
 MISC ChangeLog 15103 SHA256 fa2792b312ef741fa92927cc59971a69072fe6805e76db02a06b8116dac44f00 SHA512 9affbf0fd1bdaba029e118a98a2ac3c5f15f93da18ba1c44432f4bb6340320183eb97794bc7ffebed6eb7c87075278aad19d81eab4e1049f7de0d10d53680cf3 WHIRLPOOL a375ffb483a8ef6f8654787d58fe831f6f1e44ff5fb152d0f113ee05801b3abaf64f5f7f039cc2c9960b425ea3b566a4023c79c2e72a11f8d2bd8a6730ea0054
 MISC ChangeLog-2015 5355 SHA256 609cd90fcfb8b6b7bf0d6a267d21eb0919244a066a84aa1c52d78bb7c314b758 SHA512 75aa0b1de69d27cd099c7d87ef45a694346cb2b45b8843db71fea4155f141122ff563813a0addc83132a548cf0f7251903abb32e3d659da225a6a25d009b4671 WHIRLPOOL da3039eaf919802faae87a7295089aff1a44c025431eb95277e0cfd10a6ab77849720eb380e8b0558d06bb69979308495f00919b2222474f39022843d8a6d9e1
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.23.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.23.ebuild
deleted file mode 100644
index c125ba2ec2ad..000000000000
--- a/www-client/opera-beta/opera-beta-49.0.2725.23.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.31.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.31.ebuild
deleted file mode 100644
index 96ac80993a41..000000000000
--- a/www-client/opera-beta/opera-beta-49.0.2725.31.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild b/www-client/opera-beta/opera-beta-50.0.2762.4.ebuild
index 96ac80993a41..96ac80993a41 100644
--- a/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild
+++ b/www-client/opera-beta/opera-beta-50.0.2762.4.ebuild
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index 9a523188e826..f76d9beb84ee 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,7 +1,5 @@
-DIST otter-0.9.12.tar.gz 4211473 SHA256 1a184561b9dbf3443cf1f83ad8604976b1b06cc00a93306331b364f237363e20 SHA512 65d6d89fbd632652bde00418954f46a5617548a189ab8863102dedb4fc1be62e41d2b187ad67eb5a6214c96d6b5957223ffbe24c1f641bb92295ac3e846d01d2 WHIRLPOOL df1034578b553a30fa79a8038f3b26e33c0570cfb52645c5bfe3a6a1f31a33a98f12b57f25ca2376a2f4eaaa9c4949579369f2f7c3fcd8f4b5792ccfa2449973
 DIST otter-0.9.91.tar.gz 4422341 SHA256 31ba7efc9359f553c600b190a8f4105a98818cf2022f32298238397912c5e13a SHA512 d7a98c5a9ef8dc2cd134ca20885c4332f96ef5ebb31bee968d132ca6cc6f30786e382be42decd10e4b0d85f7ddd67fb6dd008ac130d4ba4cf5cbb7423ce9f63d WHIRLPOOL f0e5dd25bae9f589a6c533d7c01665a3c8886e1398405412a8fc95f61c7d8f1bf7e75ffa20ffbb1a43b2539032ca672f0111b0b5de16f828b36f97acd1578f23
-EBUILD otter-0.9.12.ebuild 1508 SHA256 3b3e855c1529031344401b0452da773cadf83e638b495bb1088ccbccfc42cbb6 SHA512 0fcc4b7b5e39ed89e6cf263ae674d3b7da7904f25085b0555059d1b0db18dd22a848077a2a4e872ede80b5830f19842403cca1b48cb3ac395ca8b819fdc13a23 WHIRLPOOL ca23ef26e12dafaad7ebe90f82fa71ef153b882f49656a70e63f90c7f452297427fa5f9e3240e80e09e43fd7f73e7290a5973292e54da2bb312776aa8cb43377
-EBUILD otter-0.9.91.ebuild 1523 SHA256 621c01098b40ea8fceac2d3ba7da9cd4d9d2dd8f93905bcafe7a2d0fa91976a7 SHA512 94c3d3d84d0766a739e1dc11c69a75cae6972da18f2ffb265127a6639b7c891b8c68bc1e367c9031fb7b14157a5f65314125082940f1cda4273124aa27ee6eb4 WHIRLPOOL e57c8ce303a9bc496c4f884e6f94b7cbf0209dc05afabaa7170d1c96b4e0c029454efb3b20b21eec0b590dbfb801b88054fac3f49deedf382fcf9ff8a97740bd
+EBUILD otter-0.9.91.ebuild 1530 SHA256 6cfa42afbbc9f562857cca6be98bc21dac482c0cfc1a9d3022b5e77af9d18b14 SHA512 1fb2dbb7bdfe8e6e12c756ad3bba13d80c1f394cd37f2c38ecc551d2968e5d76be84c5c30ba87c4d435ddcbdea38aba1e780293e4f4a5de42e71a08f5195b941 WHIRLPOOL 6527a03225e07266920f23dfe312c711c67af02bb9d3e8ff34f70b34b28869a4bb653eb3520262f80eba0b07708cdbf041a6bcdcc823df58956c9680c260659c
 EBUILD otter-9999.ebuild 1238 SHA256 f98e2ef939efab2fe53332128b29aba79e59a1ba8493409a9c07294c4e2bed13 SHA512 a015a0aa3b313f8c24e1508a67ff8a8498d02903a4214fc2e9de4b87238a0469ad6221035c16e0649fe2c3197f29b5708a8ba275a102e08c9cf86ee08bfaf151 WHIRLPOOL 8fc1e6e7e922d328afa3c6b6f71b87c0ff860836e56720af51b8801f3ab1938256adb611515550070057194807f66bd2f794688d620180c63b2f923a4520883b
 MISC ChangeLog 4190 SHA256 48ef8891a4228e23d18b44f855e7e4eb48f4400c93da85501828ff543de64045 SHA512 ad35d91f52044c78ca83df6b0202c29646f3b9b8557b1d80d6612b946e8aa71a94a1b48ff1b0931fc0be5464d75e65037e83f8a9e526a3381f06fca9d78b04c3 WHIRLPOOL 6d9d672e03e1049d49eec3726d60727c02ba7409254285cba2174776781ae72756a43f8494719555cd52a50c7bdda5d392be224a9b1431d6bf55325d089e0097
 MISC ChangeLog-2015 1815 SHA256 b5aaf3cdd0948bb6ff7025ae32abbafce7d199c9986a1893ae96629cd24a09e1 SHA512 4f91c00e1a85d72814a0983084421e461d4945b4dd63aa6a9b220256d964a990bbc3b25e8a461162cbb0cbcdbd923d9254790f882845e95f1078a2b3b5cf6bef WHIRLPOOL 7cf898bfa03569eb757f571a57463d18326fae0eb26b3514fc6e58ca4a7c5f4bcf2832b4840cf96f04f886f887c802a0eb789e0549096ba87fd20bc96a27567d
diff --git a/www-client/otter/otter-0.9.12.ebuild b/www-client/otter/otter-0.9.12.ebuild
deleted file mode 100644
index 7ece4e1e4720..000000000000
--- a/www-client/otter/otter-0.9.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/otter/otter-0.9.91.ebuild b/www-client/otter/otter-0.9.91.ebuild
index ec42388d0713..39aa4783beb5 100644
--- a/www-client/otter/otter-0.9.91.ebuild
+++ b/www-client/otter/otter-0.9.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="spell"
 
 DEPEND="
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 352025ddf1b3..3b5b9867d6c6 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,8 @@
 AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 SHA256 260fe8e0c736f6ee34136b417d4798099d83abc55adffca6903966d21fa73a66 SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb WHIRLPOOL 036b6f99ffe4c39231293c3a49fca90aa52de8273757dd1fbcf3660c669fd05d22ed6952ccfd50b18e008d6f279cc60d020284581cef63385c9234ba6c1a6b36
 DIST vivaldi-snapshot-1.13.1008.11_p1-amd64.deb 50222160 SHA256 1ebed0a30d6bd9c97dfc599c3853ab0c85fb937f93a92d0dd4ac0c519ebf845f SHA512 e0eaba622d2197ccf16f53d79636b7f9746b1db41f615f44777efdd582a46c46e4a55a58737ab9116a2f995ea305922729fb0b3c3ea74437d938822bc328e036 WHIRLPOOL 1ea39c1ededfba984f9fcfdcecf0a81669fbabe9afa254c3a9be4a68f33004b4377b3b13dff23ee49e67a818bb0350ace0a5e21b1fc6a25aad875ad959d6d38a
 DIST vivaldi-snapshot-1.13.1008.11_p1-i386.deb 51124850 SHA256 408d93d06cf0fca5cc5063387b3d125151cda02a077b7821879a4be64fc3b815 SHA512 2ec6592735fedfe1e3661c0882e785ba71006b96f3315c1bb0e7395fd4e2dae0c0f2ad07ebe45c60d8a826a7be100c534d6cf4fc4a797cb133cdcd57a5f3b2e7 WHIRLPOOL 5bf1ed5d0a16d304cbca41be40a21ec534cef8ce7f4147cbcd8148669d1391c6574a3408c6bc6e864ab23493e5e5fb1ccc462185c09713ad6651a1b741035585
-DIST vivaldi-snapshot-1.13.1008.3_p1-amd64.deb 50248920 SHA256 f80a072d7e02ac6844d3e7e99443b182c2442ea19c3e77e460b719fe7066a375 SHA512 73e40a6dc46849b9f78572e849f2bbc0d685ca5b46c1b2eb1d333dd2cd21fe954e25cd5434605788d6b2290f5b832d955ce938346462f2ba464c2d6bad8e2ad1 WHIRLPOOL 7dce017051f46008fc29252cdbaf296ec68f57ad440ba535273717e12adb6ba1daaa85b875a75607ce6b475e4ff09982c475bae9e4a8de6b185e7a5f930afca1
-DIST vivaldi-snapshot-1.13.1008.3_p1-i386.deb 51128206 SHA256 44aa8392265275a0cb6a16a6f1f1ebc0358c3be3bff415bf7ad61ef8ab6e5b2a SHA512 265b4649b0b67a69f07221118bd78f9c6675a7b8efd709aa0c3a0f272556512fde5349911ed5745121a37ead82d9cf36d11d0398a84d77a923d6e1a716104741 WHIRLPOOL 77fd37501190d4687a03d235a50ae90d7c78b4e0f391ff1e60232297525dea085d79c258ca857924fca1b29211776f40ab35a45dbf53639065703d9e3a59ba6f
+DIST vivaldi-snapshot-1.13.1008.14_p1-amd64.deb 50249748 SHA256 1bbc27fbeba82badbd0ab9323c460e50fae7027ad4ea5ceb574181cd77d35593 SHA512 2930d02295185bf75080df8c1da8390ac18f67a28de9944abe49d5a3ef0aaf701a303b9857b2014d2144e47241e19e9963851289478fa516f1630deff9a79edb WHIRLPOOL 5ffd32bc24ce51ddd913c8012c100ea60f3ce40bc50df62aa8dc7a77d9f897333b4f22c9fda93765195bb9ad3bf4bb2ad8b1c5f3397765e85e8c6a6c5eb91b03
+DIST vivaldi-snapshot-1.13.1008.14_p1-i386.deb 51126596 SHA256 5b345b62164bbfd32ada5f31196b80c8e298dbb6db0e28c25678acaf275c2b9e SHA512 5ae034ab377953946411c559eae7fc5b447ce6a4c77f78b336d119926c1daf06b56ce80c4c33817fec3d6dd0e98998b9c15337af3cc78b455c4d83b595851446 WHIRLPOOL 69da0286f53f4b8034d6bcd51e60e3a62357b42f01e914717d9429330dc0a7c25f5399ea633086981866cc7ebeb8a8f2ee75ac82e083f1cf74144bafaec77761
 EBUILD vivaldi-snapshot-1.13.1008.11_p1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
-EBUILD vivaldi-snapshot-1.13.1008.3_p1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
+EBUILD vivaldi-snapshot-1.13.1008.14_p1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.1008.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.1008.14_p1.ebuild
index fff39bc27059..fff39bc27059 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.1008.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.1008.14_p1.ebuild