gentoo resync : 18.11.2019

22 files changed, 905 insertions, 199 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9c1988fec682..6ecaab03a98e 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 61f9c5e48f56..2dcd5108156e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,6 +16,8 @@ AUX chromium-79-gcc-permissive.patch 3014 BLAKE2B 4b717bd5741e72b9fd0a6dc800abfa
 AUX chromium-79-icu-65.patch 573 BLAKE2B b716eeb78ac2fe7d32328274b8ea4f79cbc858700de0cb256fddaff35e4c593ddaec3e96469fe371399db112015ffbbbb6fe91fcbf151ca1e412a4104a0ea5f9 SHA512 2503799bd638e2cd521c04b5104081d332177e68c3c22a66a4c8930a6ff0da250893ac9aa5eb30f1a97faf78a2d33b552d69d4393c1f6278ab63e3609edf338d
 AUX chromium-79-include.patch 5476 BLAKE2B 3c5ba004d51f48c3e07f9b7663b79a2573dd3b6beed3e30a7222c10c77e9f0be2b0d57b8b871657aea73d2dec2a394d37f770802414a3861f1bb4b9447905f6a SHA512 59c35e86720786e24e999c32064343220fbb40a4f8dc517b83aeef0cbc0f29042c4ff2ef99db5589eadff6743fb5fa55e5d0128c6490bbfa725e52071398b8c9
 AUX chromium-79-system-hb.patch 643 BLAKE2B 82cf0464a338034e6aae27d842d5571f2d2356c6a967186e992f6487ad9f45355166957444f70d1b1451d4f05a9572a48437c5d2352a6e473329b5dc6cc18d40 SHA512 7b19a7740a12823b4aef1ab60d7e06ca77edaf34af42e9ac2b029b5560c496f6c87dbaf11fa59b950f80b836a9bd97424c8e38d2d26101b4ac9f26befa062038
+AUX chromium-80-gcc-noexcept.patch 1790 BLAKE2B 41ac24639a3234280ca4f6a3c2da70995bace3d6facfe21b2553bc6c4135d8179b913f89518e54a776bb95a2bcd3a60d018f237b2e5422277b1e32e2d526f6c1 SHA512 af5c4b1cf9823bca957d4eda0af378e73341f8b996d71b7d62a255a5b41b03c32c3a9c0cf51425a87b36526ecb7ca48783787b0837cb8781499ba45c2b52ba51
+AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e
 AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
@@ -24,8 +26,10 @@ AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888
 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9ab14fa80b042b4237cabdbcb06425e4d1c72200ec49c3c1383cfc95013cce4df411b0a2397b79030d41a0379ae80a0c60bae1fbb5ffa SHA512 dcb62b82b34d5d6982762cacfe3ab7d3538d908b3befe7666f5d70d98ba4f979b5bf056e5c5343ed76aa744a643318fc5a75ddedfcb1b7de3e7c28eb2587439f
-DIST chromium-78.0.3904.87.tar.xz 742861696 BLAKE2B f8e99207876d879dc74873950e3647d41f0c687a9cd6285f44d54a4c39ceac68d455a79c38f0c9c4815ad025b2b6fae95305f0bc47e2d4c0f2937810068ffe1e SHA512 9c59c01c7224771dd1db648a8cea6cda646062b4b172eb7bf0767a0b5ebead038697a8c0ec2c4ef758b876bb7a1c862223b8ef3c23308fd0c99752444305a713
-DIST chromium-79.0.3945.16.tar.xz 778029316 BLAKE2B abcc71329e6290699a1cc14e051f9026f5c2f2df275f0f65b6b3073a410fc0d633329049cd67e5497dbc2c319aa708e6406bec5130848f3d90461db6086024b2 SHA512 fac17c45dca40f9d079d9beaa2660ac9dbd47b985587b6adfaabd5ae53277be008cd358b18041d7961e31eb0a244a19c035b7de25c32b62fb8e99582ced83b3e
-EBUILD chromium-78.0.3904.87.ebuild 22982 BLAKE2B 8e427972b294bbf974b4634b450c1114f7e1dab5559efa8df5ecd6532b41d4c562663c212b032c9eeac4054216dcd5acecff5bfa23a353a59ba4c53c62dacadf SHA512 c6812c14c89182ea0b72aebc21ded27f8b7097d5537db6e33b3a794bc5ebad461c1af2cdf984325bd64a5e52968f66ee3c41041489190b701ebe3d3d22a600b4
-EBUILD chromium-79.0.3945.16.ebuild 22888 BLAKE2B a88344a3e2e678740824e00977d25f6ab94ece51b8ca0d34210e9ce62ef84d454af052a63a1bde60263eea6c2e9b044c4ff4f9091f598bed9c291aaef72accad SHA512 a4d7cb3c393006c062804a15e45c4ad99cdf6f173b96f3a0b183e90b21d81491f6d40923d7031d5577faf8043d514a619016d9ed0f3b738dbe689602992e0a24
+DIST chromium-78.0.3904.97.tar.xz 742793812 BLAKE2B e7fada913f5831d805a50445da41ecbca7e27af52574ce242f427c0e4c83a74ae0283eb1667d74d39eb88f05e88e5a389945628666e24e26d635f74c43c8bc55 SHA512 e29312fe5c15eb6888a2e4d7e197c710d53feeecdf4e534c59f3db26973fee13f48880b46a7c3b132bb9989eb617db9c6138b809c3cb762332a9db25ad6d33dc
+DIST chromium-79.0.3945.36.tar.xz 778020676 BLAKE2B abf0a15f5bea2af0c2b42a6676f5bb3fb0025c1d2644dfc6c1e47e1d65c61607a46eb09877f36cba3936d5df0f993b8a801f10e3111898f93fd85b270c3a7d99 SHA512 9b534ea0bf39cb5dbf5a16e652fb6f06b3f0fa578ae18c06e947927c50d1e4fa663a8341f9ab6d1f914e4822bfec9ea98c05c376b465d61d49ef91186abcded0
+DIST chromium-80.0.3962.2.tar.xz 788407196 BLAKE2B f7ece5f654f7b479ac4aad42e18dc2454c46b39353bdf6057c30aeb30714f033af21228269510ddd4ebb15b570987cdbe0d0ae67824368f205fbdb9308cbed07 SHA512 29460df7e6b8f4b01fea06faad236690739e250170c190ee991090fc300a3cbea034ebee50731485ac578d5f8c83cfc86e9438bd6ba91c686f17bea78dbf1e86
+EBUILD chromium-78.0.3904.97.ebuild 22982 BLAKE2B 8e427972b294bbf974b4634b450c1114f7e1dab5559efa8df5ecd6532b41d4c562663c212b032c9eeac4054216dcd5acecff5bfa23a353a59ba4c53c62dacadf SHA512 c6812c14c89182ea0b72aebc21ded27f8b7097d5537db6e33b3a794bc5ebad461c1af2cdf984325bd64a5e52968f66ee3c41041489190b701ebe3d3d22a600b4
+EBUILD chromium-79.0.3945.36.ebuild 22850 BLAKE2B 14aa61ffc99e333cf167e2f685e5abb2668fd5814a02fb4117918cdd5131f767bfcb3f2eb62ba9355556d1c59cbcd04cd2492dcfb17b9c718eed1840f5dbe537 SHA512 cf10f2a718598be9558f784719ae66c19cfce63aaf4980f3b786ccba470d63e4a3a3d5cbb8f8adb100f51a9b5774469e8219a947bae6237339bae5301e5928ff
+EBUILD chromium-80.0.3962.2.ebuild 22599 BLAKE2B b289ef53c3c9172576503cf8667546e7036de0e5447e01394c37c23fed0358dd92c5a8f7a0777f45fc4af61be8bd2ca4b64de4ba3d9394fb3d415b767d2c2173 SHA512 ba864f1d5c4af3e2bdae5828a037fbc8ffa23b9b9308671b183dae460b8c159861b0a66dc56ee382bee0c9acd118af7cdcf0d1b664a8e3fc1a65b1a97ab96012
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-78.0.3904.87.ebuild b/www-client/chromium/chromium-78.0.3904.97.ebuild
index de0984e85449..de0984e85449 100644
--- a/www-client/chromium/chromium-78.0.3904.87.ebuild
+++ b/www-client/chromium/chromium-78.0.3904.97.ebuild
diff --git a/www-client/chromium/chromium-79.0.3945.16.ebuild b/www-client/chromium/chromium-79.0.3945.36.ebuild
index cf14a2868712..b15b4e080dc8 100644
--- a/www-client/chromium/chromium-79.0.3945.16.ebuild
+++ b/www-client/chromium/chromium-79.0.3945.36.ebuild
@@ -144,7 +144,6 @@ PATCHES=(
 	"${FILESDIR}/chromium-fix-char_traits.patch"
 	"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
 	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-78-icon.patch"
 	"${FILESDIR}/chromium-78-protobuf-export.patch"
 	"${FILESDIR}/chromium-79-system-hb.patch"
 	"${FILESDIR}/chromium-79-include.patch"
diff --git a/www-client/chromium/chromium-80.0.3962.2.ebuild b/www-client/chromium/chromium-80.0.3962.2.ebuild
new file mode 100644
index 000000000000..6f34c5068d50
--- /dev/null
+++ b/www-client/chromium/chromium-80.0.3962.2.ebuild
@@ -0,0 +1,736 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-65:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.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-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r10.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
+	"${FILESDIR}/chromium-77-system-icu.patch"
+	"${FILESDIR}/chromium-78-protobuf-export.patch"
+	"${FILESDIR}/chromium-79-gcc-alignas.patch"
+	"${FILESDIR}/chromium-80-unbundle-libxml.patch"
+	"${FILESDIR}/chromium-80-gcc-noexcept.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	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/cityhash
+		base/third_party/double_conversion
+		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
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		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-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		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/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		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/jsoncpp
+		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/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		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
+}
+
+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 [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! 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)"
+
+	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+=" closure_compile=$(usex closure-compile true false)"
+	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)"
+
+	# 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
+
+	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
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	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 cpu_flags_arm_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"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# 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
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 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
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-80-gcc-noexcept.patch b/www-client/chromium/files/chromium-80-gcc-noexcept.patch
new file mode 100644
index 000000000000..93ac6c409be3
--- /dev/null
+++ b/www-client/chromium/files/chromium-80-gcc-noexcept.patch
@@ -0,0 +1,48 @@
+From a75a2539ca600163f2136776fdc751111e887cd7 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Tue, 05 Nov 2019 17:57:52 +0100
+Subject: [PATCH] GCC: do not set noexcept on move assignment operator of ColorSet
+
+GCC build is broken because ColorSet default move assign operator is
+noexcept (because the color flat_map is not noexcept). It does not
+break clang because clang does not warn about this situation when
+building with -fno-exception.
+
+../../ui/color/color_set.cc:14:11: error: function ‘ui::ColorSet& ui::ColorSet::operator=(ui::ColorSet&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’
+ ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
+
+Bug: 819294
+Change-Id: I00f4374fbf3d41dced9f9451c90478db528cb986
+---
+
+diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc
+index 56564d7..0d43b2b 100644
+--- a/ui/color/color_set.cc
++++ b/ui/color/color_set.cc
+@@ -9,9 +9,9 @@
+ ColorSet::ColorSet(ColorSetId id, ColorMap&& colors)
+     : id(id), colors(std::move(colors)) {}
+ 
+-ColorSet::ColorSet(ColorSet&&) noexcept = default;
++ColorSet::ColorSet(ColorSet&&) = default;
+ 
+-ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
++ColorSet& ColorSet::operator=(ColorSet&&) = default;
+ 
+ ColorSet::~ColorSet() = default;
+ 
+diff --git a/ui/color/color_set.h b/ui/color/color_set.h
+index b273c48..3eaea42 100644
+--- a/ui/color/color_set.h
++++ b/ui/color/color_set.h
+@@ -28,8 +28,8 @@
+   using ColorMap = base::flat_map<ColorId, SkColor>;
+ 
+   ColorSet(ColorSetId id, ColorMap&& colors);
+-  ColorSet(ColorSet&&) noexcept;
+-  ColorSet& operator=(ColorSet&&) noexcept;
++  ColorSet(ColorSet&&);
++  ColorSet& operator=(ColorSet&&);
+   ~ColorSet();
+ 
+   ColorSetId id;
diff --git a/www-client/chromium/files/chromium-80-unbundle-libxml.patch b/www-client/chromium/files/chromium-80-unbundle-libxml.patch
new file mode 100644
index 000000000000..0f369052cde2
--- /dev/null
+++ b/www-client/chromium/files/chromium-80-unbundle-libxml.patch
@@ -0,0 +1,101 @@
+diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn
+index c481bd3..3aaa1a4 100644
+--- a/build/linux/unbundle/libxml.gn
++++ b/build/linux/unbundle/libxml.gn
+@@ -8,11 +8,52 @@ pkg_config("system_libxml") {
+   packages = [ "libxml-2.0" ]
+ }
+ 
+-static_library("libxml") {
++source_set("libxml") {
++  public_configs = [ ":system_libxml" ]
++}
++
++static_library("libxml_utils") {
++  # Do not expand this visibility list without first consulting with the
++  # Security Team.
++  visibility = [
++    ":xml_reader",
++    ":xml_writer",
++    "//base/test:test_support",
++    "//services/data_decoder:xml_parser_fuzzer",
++  ]
+   sources = [
+     "chromium/libxml_utils.cc",
+     "chromium/libxml_utils.h",
+   ]
+-
+   public_configs = [ ":system_libxml" ]
+ }
++
++static_library("xml_reader") {
++  # Do not expand this visibility list without first consulting with the
++  # Security Team.
++  visibility = [
++    "//base/test:test_support",
++    "//components/policy/core/common:unit_tests",
++    "//services/data_decoder:*",
++    "//tools/traffic_annotation/auditor:auditor_sources",
++  ]
++  sources = [
++    "chromium/xml_reader.cc",
++    "chromium/xml_reader.h",
++  ]
++  deps = [
++    ":libxml_utils",
++  ]
++}
++
++static_library("xml_writer") {
++  # The XmlWriter is considered safe to use from any target.
++  visibility = [ "*" ]
++  sources = [
++    "chromium/xml_writer.cc",
++    "chromium/xml_writer.h",
++  ]
++  deps = [
++    ":libxml_utils",
++  ]
++}
+diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h
+index ff969fa..e0f3ecd 100644
+--- a/third_party/libxml/chromium/libxml_utils.h
++++ b/third_party/libxml/chromium/libxml_utils.h
+@@ -6,8 +6,7 @@
+ #define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_
+ 
+ #include <string>
+-
+-#include "third_party/libxml/src/include/libxml/xmlreader.h"
++#include <libxml/xmlreader.h>
+ 
+ // libxml uses a global error function pointer for reporting errors.
+ // A ScopedXmlErrorFunc object lets you change the global error pointer
+diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc
+index 92464f4..4779290 100644
+--- a/third_party/libxml/chromium/xml_reader.cc
++++ b/third_party/libxml/chromium/xml_reader.cc
+@@ -7,7 +7,8 @@
+ #include <vector>
+ 
+ #include "third_party/libxml/chromium/libxml_utils.h"
+-#include "third_party/libxml/src/include/libxml/xmlreader.h"
++
++#include <libxml/xmlreader.h>
+ 
+ using internal::XmlStringToStdString;
+ 
+diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc
+index 51fce8e..aa3a34f 100644
+--- a/third_party/libxml/chromium/xml_writer.cc
++++ b/third_party/libxml/chromium/xml_writer.cc
+@@ -5,7 +5,8 @@
+ #include "third_party/libxml/chromium/xml_writer.h"
+ 
+ #include "third_party/libxml/chromium/libxml_utils.h"
+-#include "third_party/libxml/src/include/libxml/xmlwriter.h"
++
++#include <libxml/xmlwriter.h>
+ 
+ XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {}
+ 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 9cc10c1f5444..5b3c9b2fadd3 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,6 +1,5 @@
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-52.9.0-blessings-TERM.patch 2276 BLAKE2B 2413368995dd8421a634e2a50f4bd9ee01062043a18bef4cd07645ecca05459891ff5aaa294f3abbc85e7ed9515e8936ede8b7faacfb19fadd81ec98ff8080b0 SHA512 08f8d2ba3258b3ef6bda1d2f8ea429e579e1f616dd940f6dc25ef231199d9155b22631f4366908c77ec5b9c4ce63310c9b9e075a6a7a7503b6423e13082f2b91
-AUX firefox-60.9.0-rust-1.38-compat.patch 6208 BLAKE2B 459d451e70fefeaf4bf09b7dd3dc6a7cb5b28b066eac09eaa5ad35abe1a5b6efc8293ac643a5c4d005d9b837590d6a9302495f7b6a6bef5b25b4c20800646ceb SHA512 5c469a7741c3303922c91770e8cd9b474b1f8e3a32e6381ad73c8c8bd302d4c67d8d7675bddb69147311c7aa1c7e4c25a37a2626eb7f82b2d3c72b299ba036fd
 AUX firefox-68.2.0-rust-1.39+.patch 15062 BLAKE2B fdb8b871a57581c092142d167803a68a67dc1b7c8ea04bf2120d531b2a770e12ca5b16778a93ac04a184ca05c515733ded2f55a046c0ccae10ba5c2850cf91c5 SHA512 b19291920587c1833215dea8e55a98bb02199ed471d19f8e16fd3ead74fceeb2a277e7f3d906141a6d2609415d2bff2afd887024671dbc35c93973e8756867ce
 AUX firefox-69.0-lto-gcc-fix.patch 1023 BLAKE2B e70b01fd819c00695f1b5526a7cec85e43ed3d4458d85da67eb46a27044a18552f8de21f43994f46b2873e31021f504564e15c4dd37d63bfaf00680c91af0093 SHA512 3dcb32196e6d9c44ff85a2539e73907196664b2e8c01e1b9bf8f03b614a10c9fd8e76a35369bc7de5479cbb12a54dc5777f3d4c34a0ecf4c095b55bd51599bb1
 AUX firefox-70.0.1-rust-1.39+.patch 10359 BLAKE2B d8e7ca0cc2bc42a7b77cc1e2338ecfcba16888396a316aa35d7f195caa3bef5323456178393a08b030c8b6b6a49d56ad746a672c64dd6d88b1547cb6847c6b36 SHA512 7dfd4441d597a73db7c088774ee7273256b3befcf8ee545e8aee05ced740338a2bb0e58824b44d7f6e8c6ebc094c4f17e4b39a84d4b4e7d4cbef0dc343268600
@@ -290,5 +289,5 @@ DIST firefox-70.0.1-zh-TW.xpi 568302 BLAKE2B ff06766fe46d17e7393e93554901548287b
 DIST firefox-70.0.1.source.tar.xz 326335800 BLAKE2B a7f748719a42f5929150f8a6e9ff6e11d3f92deedc30a1c1f0b6ec7fc3cddc76f7faffc78e0544949599d6142a9fd540cfe467d393c42bcbe9ea027212a937af SHA512 798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-68.2.0.ebuild 24837 BLAKE2B 9c94f39a26ee2b162eca3be61561fc698fc26c38382ed406b6bbcbb472ec184a999679f22082bfe277c47a1eb199f7875714ee36b0fd98254ef39cf47152c38a SHA512 929b7c6a77f97a5930fc0282e3b8e826b30da1d9cd44f0594c70de1ec7dc28993979da8ca56dfdd6db3f28328e6c612b92b910e24632155837d91defcde4c5a4
-EBUILD firefox-70.0.1.ebuild 25685 BLAKE2B 3d14cf7e39867433480ecd44f431752147754d4ffd85007cb949a264eb99e20b3329aec40c9d60ba9d401f9792b06b3f831d90bd8a9e7c6e190de64b74f9f3a1 SHA512 76c1647bc720d27f6f9eed17396504fdd66a0609f6bbba236c3e56c58260580d96f8fb7cd9d90f24728b71a8a2efaecc66cec35901c6f520d1c46a02c669b1d6
+EBUILD firefox-70.0.1.ebuild 25685 BLAKE2B 8e2cce6ac6cccf44c70782a0b5f87c300a7387fc5fc5ac1244523a588dc330419f9ea580998752bde72c01d8036681b9cb34015e7bcd80ca184d4a224cbf524d SHA512 e489569a61ee6eaf41c14c223cf0d87eaa265ff31ac2e7e1ffbfd924650137e0956c4af1823d5af37d39546b60a95846313e8203ad77c5bf22c39184946d3d5b
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch b/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
deleted file mode 100644
index a9183f24e0fc..000000000000
--- a/www-client/firefox/files/firefox-60.9.0-rust-1.38-compat.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- firefox-60.9.0/third_party/rust/cssparser/.cargo-checksum.json
-+++ firefox-60.9.0_b/third_party/rust/cssparser/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
-\ No newline at end of file
-+{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"5f36cd1b18562e427222147ca7c971a1a65c32fbbc8bdd00c57c4dd2f5823fa0","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
---- firefox-60.9.0/third_party/rust/cssparser/src/parser.rs
-+++ firefox-60.9.0_b/third_party/rust/cssparser/src/parser.rs
-@@ -555,28 +555,34 @@
-         }
- 
-         let token_start_position = self.input.tokenizer.position();
--        let token;
--        match self.input.cached_token {
--            Some(ref cached_token)
--            if cached_token.start_position == token_start_position => {
--                self.input.tokenizer.reset(&cached_token.end_state);
--                match cached_token.token {
--                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
--                    _ => {}
--                }
--                token = &cached_token.token
-+        let using_cached_token = self
-+            .input
-+            .cached_token
-+            .as_ref()
-+            .map_or(false, |cached_token| {
-+                cached_token.start_position == token_start_position
-+            });
-+        let token = if using_cached_token {
-+            let cached_token = self.input.cached_token.as_ref().unwrap();
-+            self.input.tokenizer.reset(&cached_token.end_state);
-+            match cached_token.token {
-+                Token::Function(ref name) => self.input.tokenizer.see_function(name),
-+                _ => {}
-             }
--            _ => {
--                let new_token = self.input.tokenizer.next()
-+                &cached_token.token
-+            } else {
-+                let new_token = self
-+                    .input
-+                    .tokenizer
-+                    .next()
-                     .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
-                 self.input.cached_token = Some(CachedToken {
-                     token: new_token,
-                     start_position: token_start_position,
-                     end_state: self.input.tokenizer.state(),
-                 });
--                token = self.input.cached_token_ref()
--            }
--        }
-+                self.input.cached_token_ref()
-+            };
- 
-         if let Some(block_type) = BlockType::opening(token) {
-             self.at_start_of = Some(block_type);
diff --git a/www-client/firefox/firefox-70.0.1.ebuild b/www-client/firefox/firefox-70.0.1.ebuild
index 99e92f2e5b2c..7037f224917c 100644
--- a/www-client/firefox/firefox-70.0.1.ebuild
+++ b/www-client/firefox/firefox-70.0.1.ebuild
@@ -103,7 +103,7 @@ CDEPEND="
 		>=media-libs/libaom-1.0.0:=
 	)
 	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-icu? ( >=dev-libs/icu-64.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
 	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 648220407090..4407c1069270 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -3,5 +3,5 @@ DIST httrack-3.48.21.tar.gz 1805754 BLAKE2B a73c8210b3710a7eacce1e60556e302bb947
 DIST httrack-3.49.2.tar.gz 1835116 BLAKE2B 4073b70268bcea8acf0a9ac10deed14764ccd405c82f1b9f48dc74d3dbef130161234b59e70e72305a195d21155474831e8359eea9b96d275481a69b1c1ff561 SHA512 84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8
 EBUILD httrack-3.48.21-r1.ebuild 1112 BLAKE2B 73c8d48531a784a6dd861c27b7d60fe1fcaf63b9576e2f113901ba8e5584bdbe71e7031eae5974d1c32129ec6e675536fc1d376e1f49c87159f612ef4e2a2a3a SHA512 7e3f37415d324fff99ad41e14eb6e7f1eb0ddb348a8555d1af43a0ef9bffc2c051bd460066346f06c51ce20d42bbda37b8a25b94b6f63c303d30eae813df3caa
 EBUILD httrack-3.48.21-r2.ebuild 1194 BLAKE2B 4818b67ee18fbcf7af518826a904fb3ac21b33e56c147edc825bff5e84ee0cf3bbbfa848543026f4dd596b803ce60d1368d6cfab0aff3789b520e5564c077b5b SHA512 3dc5090dbc8f3851ab76961c937f89ef7f89491f357ff80ac5ab0aec18ffdf1160a234390e1c7bb5453f7b048d5dfa47531e92fe8f4617095b62653753d4b7f7
-EBUILD httrack-3.49.2-r2.ebuild 1270 BLAKE2B e32334156dc03f31e6c62167e8b38016f71716ce66c75e4c9aa686a8d3bbec2af5f894808b39a614eca72f3e43647efaf11620381f2d48a902d72242e1ab9317 SHA512 b89461ef88ed4f1290425aca8c6dcff5ae6d6fb4e4956012860284a407ba19a0a2ae15f41f1731e35e80514a6b65cd07aa8588129a423eca70ccb9edaca129ce
+EBUILD httrack-3.49.2-r2.ebuild 1269 BLAKE2B 9cadf699ecd9d4347f07b328e47e5a73585883e1fbbc3bb0b398e472c3f333d4ecdb309de9e4806719f1a3b1ad6e018f73802f9973c61307948e94bffdb41443 SHA512 e0f32e674dd3e7ef3a7e25f39c16b7f3c83dd31ff7b2b74f5a33ad2fe8a0edd05b4241bad2c7ff86911e9fa8fe9596ab370aa85ba86738137da2736000b2ff1e
 MISC metadata.xml 213 BLAKE2B 89a7efa56dbdbb38950f944228541e36e90e427e1171bc1cc9103ebbfc435786bc60e2bc2e48a6f73a70ae9d8414a5748fbf8aa18476815a5a8b4c43bca0119e SHA512 54084c6097a56011194ffb5fcd237adaf6f2940fb41136bda541f0fb3c4301c87a553fa49b03a36865d7ce911f96e70349f0b40e3828d2edbcbf0d02472ba446
diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 56fdcbcf9003..353f6e428cd2 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index ee6f7e1a3bf2..3df709bfa3de 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -6,4 +6,4 @@ DIST lynx2.9.0dev.4.tar.bz2 2723001 BLAKE2B aad4a5ad357d77b5f7e6d342178f0fe400d5
 EBUILD lynx-2.8.9_p1.ebuild 2558 BLAKE2B 8817167a71ba1749a3294461cabdffb158b9eb0ad75b65d3cf0b18a20d01ad8d66508e35b24f982d8542f7e1c80408fb690bb306a2fc746aafc60f2680d2b180 SHA512 ef7f616e64413225b792ed49d8b94d918a4d08b3985701bc1a42674613f9763f9a1a9beb330860db59f47367935d7b78525bede603e227134d1e391c487e1c54
 EBUILD lynx-2.9.0_pre1.ebuild 2579 BLAKE2B d56b2e9ce819cc905a611767f0d64be33a9078684a45e7d28465df247cccdacf3ebb26abd91d127d8dac8a6c2cddf80a38d66a541c28986184992206a916b270 SHA512 25bf1bc4c875e691c4de54fdcb2345ff546f66f1525cfbfc5740f7fcc3927167994c07421af343629b34042b2c72df1b83b542bc98bdf8570f00629e177a59fe
 EBUILD lynx-2.9.0_pre4.ebuild 2581 BLAKE2B 485cd82b5a9d91308556d6bd2f5ee2c0f908178e730a627bab3138b79016b3f1be2367054db03ba56c3c6b458bb6a91ec1d912bb17d42a73a691b677e5ac6494 SHA512 7b5d85009254f2b5f3e30cf0e33b5b8239e81d36ea571e0983bb2bc9bc0b78dba821abb0af7073a1966d4b5f83eaa8f10509d44a5a008c42bdc976502d537b77
-MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac
+MISC metadata.xml 348 BLAKE2B 579b933a675b5a84e1768be567d0ede438995c2f075519f214ff1d9430ff230058ed30a16b3d1ff58ea79a73d487db372cb4237d749be00ee4f8f86cbef153e1 SHA512 836cdc6de0757684512955ee56620611ea89f6d1f5fd9c0b2ee470fc2cf5d5bac75ccfec2ddbc083dd5ead28e4274784ad434b5c5c99de4de42b81ffaccb1ce8
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index f4f92f07c6f4..e8c4509b9a49 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ssl">Enable HTTPS support.</flag>
 		<flag name="gnutls">Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).</flag>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index ba445c9f7087..e7c040323575 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_65.0.3467.24_amd64.deb 67613890 BLAKE2B 54e8886bf04176decb8e9b50aed0eb829e01178574f4894fc3c6b7f7fa390d35fa162a07e75a28750ed51c5c19cb3278dc178acdd8757c6a2babe17681bd72a4 SHA512 c40a8c5dec4b9889b517807f5320470a504455934e747b627055c843621a54b51689448cd25c3a9681ff1300b411c3e10cc459bd24633652166cf4eb1e953f3f
 DIST opera-beta_65.0.3467.32_amd64.deb 68306558 BLAKE2B cd755df9cd404e402af6c469b8744f1bc8ddce2ae864ab4309a4b81f960bd965703a5b159c5888b00567aa0489b0aae79466d3f0fff7daeac2fa02894e4db549 SHA512 8d7b30a29fd5879d4199e982e15a094461ec5018861b6ebca23e67faeb8fdf7c07dd9af232af8d3b8d4a74bccde6911dcb1a8793707466a29a4b9dc70ac982ca
-EBUILD opera-beta-65.0.3467.24.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 EBUILD opera-beta-65.0.3467.32.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild b/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild
deleted file mode 100644
index 59a8587ec4bd..000000000000
--- a/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA 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 xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://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+:3
-	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}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	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
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || 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_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 87985c6d73d6..5bcfd70c02ce 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_66.0.3489.0_amd64.deb 68148646 BLAKE2B 67c00f9e23a64f63ce749ddf774e498673db9e44c7fcd4d93850ee9bab1627241997c49f67d0f5e365d2c2bd23a7c458fee83e85b597ddfe7610b54918d2f9e7 SHA512 0474d86f9b37c42841aa228f359f11dc3fd988593f66f5a6074f62fcbb3615c2100b91880f494ae6372c92accc33e6ad59c679e534caeb9d1573fa1a0c9f6361
 DIST opera-developer_66.0.3494.0_amd64.deb 68188132 BLAKE2B 0669dba7747356dcaf4a62638b593ea6be6ce39ed9e05013f153379586f82bcafea5adad494a0bb587b4bc998f4a3a6a0eac0678aaf6352a7bfee198ad1a8f40 SHA512 18d6b7e71159a44ffc5b79de6608c706e46cd910d78e5a37b915d7145562803f7d679901df2383f314e12233d43c10bd50e26792ccfd600df7790caab6435fe5
-EBUILD opera-developer-66.0.3489.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+DIST opera-developer_66.0.3502.0_amd64.deb 67053024 BLAKE2B 42b2b344a2a3c0c111cdab18ac7b86431b77cb488ce109018ff6e8bdc61975105ce39ca447cee7f23c3bbcfe65fa238fe900ec83c863d79c53db4cd57bde810c SHA512 5e27254a3b0b4cceb7febd8b3e3d7af9568a3ce75a2d901502cc0fe20bef6d1a2f63a8d3951fce8ab3de6563893e64bd31b6703ee7767942d66e6c07ee38a9d2
 EBUILD opera-developer-66.0.3494.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+EBUILD opera-developer-66.0.3502.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-66.0.3489.0.ebuild b/www-client/opera-developer/opera-developer-66.0.3502.0.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-66.0.3489.0.ebuild
+++ b/www-client/opera-developer/opera-developer-66.0.3502.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c9d2bd8d2a1c..9b2741a7754c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,3 @@
-DIST opera-stable_64.0.3417.92_amd64.deb 66230620 BLAKE2B 1b4c3ad7956727d9a849e545e4ff95318ebddaf2e87073cefc5c13eb685b56171cb12f9ba698dba32dddd2013897c6584ad080767bbca5693d9971e07ba0e683 SHA512 9a0ff699dc00a3984854db8838158d17a27665d91b98221a31b23fa82f0a3c1259b1ceff83902cc782cf21b4780deb8426a3cb45c88c0a7d3ea3450b15ce4e0f
-EBUILD opera-64.0.3417.92.ebuild 2283 BLAKE2B 9ae44a98f7d4631a10ef1178ee4ecddb7fbf18ca1ea0398132470f5210819f711c44c2bb9b66e629363fd2ac184533ea8fd42c8f6a6957777a0a286294d3942e SHA512 77ef1f88d31a043dd6f786dafcd9c110916bd4cd4c1ed11548a429cc91e3edf47beec5ac73148c1c4265a019f378dba1289903040f623939f87bd6b00f55e6b3
+DIST opera-stable_65.0.3467.42_amd64.deb 66583756 BLAKE2B fed26219590e1d7a03e7a2aa2fde10d1703f52c7ef630a8c3509d9c8564d015d50afb1a59e3ee0838a6b002b0ace6e3293080aaba30a04c47f6d40dd9c2cd146 SHA512 861f516da7193649f7715e8257027c40cb09cdf4eb62617595d270e88287d7bfd82ea3e47e6d4b77bcc8b7d7c97096d5b20a296d36737f7b6fe731ae8bbf83b6
+EBUILD opera-65.0.3467.42.ebuild 2283 BLAKE2B 9ae44a98f7d4631a10ef1178ee4ecddb7fbf18ca1ea0398132470f5210819f711c44c2bb9b66e629363fd2ac184533ea8fd42c8f6a6957777a0a286294d3942e SHA512 77ef1f88d31a043dd6f786dafcd9c110916bd4cd4c1ed11548a429cc91e3edf47beec5ac73148c1c4265a019f378dba1289903040f623939f87bd6b00f55e6b3
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-64.0.3417.92.ebuild b/www-client/opera/opera-65.0.3467.42.ebuild
index b28807261d09..b28807261d09 100644
--- a/www-client/opera/opera-64.0.3417.92.ebuild
+++ b/www-client/opera/opera-65.0.3467.42.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 7dfdf215f1f5..a864a7baa07d 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -3,4 +3,4 @@ DIST qutebrowser-1.7.0.tar.gz 3595849 BLAKE2B 5ace5f756550fe10a3bd09819a3d556292
 EBUILD qutebrowser-1.6.3.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4
 EBUILD qutebrowser-1.7.0.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
 EBUILD qutebrowser-9999.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
-MISC metadata.xml 478 BLAKE2B a63f582fb2b39ae44cbbc8b8f0c356de59238d31193dfb82822394b272a5cf3d80502766761067e80cdc38b4fe84a11d841b5f4200791600ed98155bbae85b8c SHA512 9cc31ac7c20bc61526e9db3947bbb2c203821fd4c339e61afadf0b6618699a1e2780545926ef80ea5de81d8e7b252986feb3d8607638478834b9236de4347f5f
+MISC metadata.xml 399 BLAKE2B 34bd345642f71d8456cd74c56e86c9dfef7f97af62ceb3b4045af0965136229bcc8dc782b748ea5bc2774ba41fc74bd2f2e1ab661e1cf9c3bbaf302761a120a7 SHA512 d1af93f580469a5720adf99ae3fd01afcdc7bc33fb05390c8eea60b5723f115a4f4e1044a49bacff8decdb92cba21563f93cd609bfb180117eeabcf02710d8bf
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 1184665eaa7c..c72c5366e939 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>