gentoo resync : 22.10.2018

51 files changed, 714 insertions, 926 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 92fe4e7d6a8a..ce1d81ded805 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cf6467792a76..893df35ac66f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,10 @@
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
+AUX chromium-ceil-r0.patch 2820 BLAKE2B 378779130d0fcfb929eff886feb699ec0b73e32cccc779048cf1dcdcfa7067a9aab66a4188917b095da8810e95c0097bb0154b67f2fef8a1584b03011c7517b1 SHA512 80abc53eebd5bbd5ee6b66f1d311ad47c2fa7fc3e39682843ec974b4f3dbb6012c7c053aa9f01fb3ffceecc92f964cdd3bd3b233c12f927a720c03610b0e7d3c
 AUX chromium-compiler-r4.patch 5640 BLAKE2B 2fe93975237f112bb280bd5b51f48e0e8454d11a91b81ce2ae0520fb59ff2c00498319e202e34f4c2abb1330ba2c7dbe9dd1a75bfd578453da533531b7dfaf8e SHA512 34e32d9e46a5981b021cffee3440582ef312e78ec1bf287c6d0f14f5ff7921a5b229238394259b8df5aa081360dd76aa6d7db095ed4e1841479d8fe55cde9fe8
 AUX chromium-compiler-r5.patch 5577 BLAKE2B 622f89f30ce182805198cf9162b867cadc72bf480a64b043772f3a525ad65beca429d3b7f6bb225cd22857d0335ed2e9a7cb72659c0c90d1a49daefeea0e7d72 SHA512 ed66baa3db6d31c9f5bfaab0fba82ff97a10fa009724d3a11db448e93c8e37ae0ba96b22476b41981da94a65d568866a0756a72b3a92cc385f8a54485612cc71
+AUX chromium-compiler-r6.patch 5675 BLAKE2B 94b38e63deae80aa5f98edf60d35d2c49d57b84feda2944b363a8a230f1282e6da1c7175383bad8ccb7e272a88532fa9a718b824edfb1d52902490abc3b832e9 SHA512 455f7d1e5eed767c7917cd8cac842c51447f05d51110da5f3509fc21870e3bc1775029cb90c39b0522ac16b239565ba5e19fe0513e609128eb59a1759a0de6cd
 AUX chromium-ffmpeg-ebp-r1.patch 553 BLAKE2B 2f9799b38436f37ed7f7de06d6f7692bcadcacc0269169cc75e48f52ad6eb1c5af54891249eecf1bd5e10efad3888dc650326b53878ad1d9360d6304b12d51ed SHA512 27d929756707b964465c2cc1b586b118ffd67b3fec84e1c6606c2d4141a6717741cbc1ebf5b4c3b40f9476220610a1ada6e80b342506c4f9d2ccbe7e067191ba
+AUX chromium-harfbuzz-r0.patch 4173 BLAKE2B 5c74627b52d004a6b108c69a87ecf7472a7d1c213cba3801d28e83806df5604de55831ac348561a3cd9471b3b3a69c6e08a2b1271b980478c1b815f14435c575 SHA512 174b1fbaec1b8a88f41a06855f0475ca18f40ee5c0a9ac8a9223c7d06fcc1173f36c85d90a332dbf48bd315bf646ca1d4943d351ba510f3045500264e82c037c
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
@@ -9,15 +12,13 @@ AUX chromium-pdfium-stdlib-r0.patch 986 BLAKE2B 58dadfcf17149382890e168cbfffefd2
 AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
+AUX chromium-widevine-r3.patch 854 BLAKE2B 27c0366bc9a7a38024a4ad6a1ee2f4730443984ea70fc1b248147f18f3f73bf87fc4c0231c071fd712f2b9cedc17126f53d8f95c96dd608d7281404222558e08 SHA512 997199a748fa8e9f552f6238364cd2430675a6eee915f76454c0d5eab01eb089d14f8ab5fa78eb37acfa1fba527e206320ba9a3ea13bdab39a5d001238df8c91
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
-DIST chromium-70.0.3538.22.tar.xz 622935696 BLAKE2B d2eb7f72aa9967d2620a705549c13d081aa5b011d47536ca3e1aa77989a9723a6187dab0d0c31c6f4e50469b05960411c8635c24cc9e58a5ed2651c5affb13d9 SHA512 5af260a217734965e4475211646a992b0c568e81610f552c13773082055ee7cc3356f9d60b85abc118e7d7866c903ddc6f4e64d1f0c4126cba19d886dc79b189
-DIST chromium-70.0.3538.35.tar.xz 622959384 BLAKE2B 1b32897a08a63e6e1a4bcabef97d5b92a568632014b1c197ae76da6f1a6fb76f0ef93b50d41556d27943c72e8b7cefd36249cdd08204992abb54742c63b4c00f SHA512 e4539ab964d95cc56c5c7d963787207b5e2c50a8aa12ac5e6d1e71f35be3adf60881b63f4c189c53f3f80bc69779556d61365afa2d8db43dba4a7bbd781591d9
-DIST chromium-71.0.3554.4.tar.xz 626667348 BLAKE2B 4cdbd7041fd087c860bfc5c731073713ac01059fa388de10684058a81178d007e6fe2ad2bf6ce58a44b5489b24ded1a29862f98dd8f9ec8484e5e0d9d7a2e38e SHA512 ad4c6bc8ab857bf1a928b959129f5b64c1333f109cc7a5482f3bea3cab070faee85e41128acc4d9e479a312dd66ec201cf115e2dd8e35587f1bdd95ff78dfd18
-DIST chromium-71.0.3559.6.tar.xz 626881656 BLAKE2B 4712e7bb9c7018ed4ace7f8d7d7c313e26c6a156c937084f5553e18bd38edd98536b09e867718ed1e9e561c3f39ddc6de4802b780e33d72f1329f636fa356250 SHA512 12ba43ee94aa185d13035c01755b0166082fe4831f1787e755de11a9b6121c0384eb04352f0582659a23908acc4544db359a30e0f22715d69f357c8a1baa3aac
-EBUILD chromium-69.0.3497.100.ebuild 20419 BLAKE2B 9620d0135e88331bba1d3c68633f299a721bae31358845689512cebb07f6d6ef36ce49a046970df97e6c22c8532b43ea1be0de597dc8f82f86625252a41c0ae6 SHA512 fb0a20c0e36d2652f827ae92f76144ce0bc32fce4f54e38796d3db166175f9e1cc31ba73efd88e7fed9e3912a3e9e9a6d48bbf75fec8dae37f3e061d8f28c72a
-EBUILD chromium-70.0.3538.22.ebuild 21072 BLAKE2B a4e1808cee6b4eb5f35064e2e3665c88d9d6b1be880dc74d13246777188b188c3b1132a441474af3f5b667103d73743ccf6ebd18d63fbc95dad59230978e92c6 SHA512 454863e19a715238563d332d8102089db00f2583b4f6cf72fd48c560ef091c3ee0ca34a4a81a83ec57698f040a863c7c85cb6502f8abecefb36b4f8e1c819792
-EBUILD chromium-70.0.3538.35.ebuild 21072 BLAKE2B a4e1808cee6b4eb5f35064e2e3665c88d9d6b1be880dc74d13246777188b188c3b1132a441474af3f5b667103d73743ccf6ebd18d63fbc95dad59230978e92c6 SHA512 454863e19a715238563d332d8102089db00f2583b4f6cf72fd48c560ef091c3ee0ca34a4a81a83ec57698f040a863c7c85cb6502f8abecefb36b4f8e1c819792
-EBUILD chromium-71.0.3554.4.ebuild 20967 BLAKE2B 0177de325dd03e94507e791f50cea58226a0a94e07c665cbed1ae838225ea68e9a20ec8d5d62b3cff7fdb71e2389e3c0a7ca0e8e393ecac8fd3933c557d39eab SHA512 7d1603753e61ecc073fef073a1506a4e57963ab156d0267013a6f2e0f3b9559d4c7296a299489667f23419a5ee5cf2455366e6dbbcf8876204a3ced7fabc3c78
-EBUILD chromium-71.0.3559.6.ebuild 21303 BLAKE2B 4d25ed2f3e2395619fbc6813d6a1b777f087f3587046e05d6ba41072156985dbd0b95259933c1ba907494a0f1bf9345467e1d2eb492d929fade6ebaae0437993 SHA512 ef2bc25cf4b1f9986705ac0d488758ea3ee7bcddd8492583b4b0abab1608b89f63275ec6cbe830d599fde0e257ad2cdf655040011ddec3c1ed2767b0847bda5d
+DIST chromium-70.0.3538.67.tar.xz 623057648 BLAKE2B fd6667d8ca82721ca4cb70b39f66c88f1e10f82a5f9b8beadabd56882f9e4e32e249b25f4484a323f8efc9d940f2afb1c73b76cea0803ce18c138adfc8bdc3c0 SHA512 923dd574dce15627678d1601d34e37285ac438bb61ee252ecd15bdec3e5f76066897848addeedd3c61f2c5e550a284d14e0af3d02ae5666c9f6eb047c9d4441f
+DIST chromium-71.0.3573.0.tar.xz 626729588 BLAKE2B 5fc5b030f8bfef2721234026ba5411896795132592db2c4732f98b08d74b31ed2fe9b59efc78754b5f72d5908f1d5ccb1054abdead51c53235c1118fa91b2cbf SHA512 27a8dd60dc319b33d954440b1e8aac382a4fe6afaca88e63175b72c6040c5bb5653d01ecabd8e8ebd99d954781299fa3bf44518c0fc396d9d56a97bdb1291503
+DIST chromium-71.0.3578.10.tar.xz 633514144 BLAKE2B 6a90e46378d2ffe97a1ab6a104f0e6bc5332750d18116ee78ad7200192260aad5ee0fcee917e6c6d065aa227eb2b5e84f392e96a6b8ec18d8bbe805a5f371594 SHA512 b17db9c3fac5f96d59bdc11faaa4664d977293eabb9d74120c2af961af8c866aaa5f017ce3a2629bcf189bbeb2e7e2d9c7d6ca9716ff361e3cfe648f0b802f1e
+EBUILD chromium-70.0.3538.67-r1.ebuild 21247 BLAKE2B 3681307167370a38aa663fcb5b8ea6bc968410f2279a7ab4eb1fcea6ddf27f781efdb9580a71f2ad03c89a092dd499f2e98bf35fcb69c5702bc18a2b44e748bf SHA512 0497ba8ac3bf278b597b07a0f2bd45d2f7e9cf62936855f388b05d2bbfe690d7e05d32abbc6bdbf2d467085b1669d1e085ccaed940eee52629bece2639bbb387
+EBUILD chromium-70.0.3538.67.ebuild 21234 BLAKE2B 02f36d673b2ddb2096a61b918127cdd2cde4d0fc3bb1543fa08d4b37537052282dc16831b857e0d6867260e32400fa14f14567895fbdecd2ad1691fbb7872316 SHA512 740627027e9f0ba5430c3f22a7560b2e6a40c07fe1429c62d2399b41e425ec0886450b61baf1521a83900cbdfe20bbc9f01733d8c741699b0028ab96513f46b7
+EBUILD chromium-71.0.3573.0.ebuild 21367 BLAKE2B b8eb58c08a386d90bbede8f61dd80e1eb7cbbdaacbfad45ad4c35482a7221cf42a44bd6999b0e44df81eeb5af6f13df2028fde1c2fdc084fa1d37153fa204113 SHA512 c20a74d4f5a75067ad5f560d8fec3e41326335e9dd8cbcca28a542d30e29f2d4e9cf8419f2941bcd25e807300d95a35268380443003a5f2fd9ca0b9d33d08672
+EBUILD chromium-71.0.3578.10.ebuild 21394 BLAKE2B 30db4490a0b8e755ae1e36be21607592456087b2accd3999b8bc0853307b1ce3def34a58f761b56d8f80d48d3e5b87bdef4bbb6343e2cef619443bce85b40dc0 SHA512 a9a65247ce68f391d00099b08d0b0b22ac97473def56b067227918a7226dcec032b200bc27a5b80fcf8ba7f0a33a95c14c98868d93e3ea88528893c69e27a51f
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-69.0.3497.100.ebuild b/www-client/chromium/chromium-69.0.3497.100.ebuild
deleted file mode 100644
index 9b12bab541e7..000000000000
--- a/www-client/chromium/chromium-69.0.3497.100.ebuild
+++ /dev/null
@@ -1,681 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/atk
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/clang-5
-	virtual/pkgconfig
-	dev-vcs/git
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r4.patch"
-	"${FILESDIR}/chromium-widevine-r2.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-math.h-r0.patch"
-	"${FILESDIR}/chromium-stdint.patch"
-	"${FILESDIR}/chromium-ffmpeg-ebp-r1.patch"
-)
-
-pre_build_checks() {
-	#if [[ ${MERGE_TYPE} != binary ]]; then
-	#	local -x CPP="$(tc-getCXX) -E"
-	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-	#		# bugs: #601654
-	#		die "At least clang 3.9.1 is required"
-	#	fi
-	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-	#		# bugs: #535730, #525374, #518668, #600288, #627356
-	#		die "At least gcc 5.0 is required"
-	#	fi
-	#fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/http2
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/spdy
-		third_party/WebKit
-		third_party/abseil-cpp
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-headers
-		third_party/angle/third_party/vulkan-loader
-		third_party/angle/third_party/vulkan-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/antlr4
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# https://bugs.gentoo.org/588596
-	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-70.0.3538.22.ebuild b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild
index 536322cbe16a..6d86b451b471 100644
--- a/www-client/chromium/chromium-70.0.3538.22.ebuild
+++ b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.8.8:=[icu(-)]
+	>=media-libs/harfbuzz-2.0.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
@@ -101,11 +101,16 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	>=sys-devel/clang-5
 	virtual/pkgconfig
 	dev-vcs/git
 "
 
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	DEPEND+=" >=sys-devel/clang-5"
+fi
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
@@ -137,6 +142,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-stdint.patch"
 	"${FILESDIR}/chromium-pdfium-stdlib-r0.patch"
+	"${FILESDIR}/chromium-harfbuzz-r0.patch"
 )
 
 pre_build_checks() {
@@ -381,7 +387,7 @@ src_configure() {
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX NM
 
-	if ! tc-is-clang; then
+	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++
diff --git a/www-client/chromium/chromium-70.0.3538.35.ebuild b/www-client/chromium/chromium-70.0.3538.67.ebuild
index 536322cbe16a..5bcc26022156 100644
--- a/www-client/chromium/chromium-70.0.3538.35.ebuild
+++ b/www-client/chromium/chromium-70.0.3538.67.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
@@ -37,7 +37,8 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.8.8:=[icu(-)]
+	>=media-libs/harfbuzz-1.8.8:0=[icu(-)]
+	<media-libs/harfbuzz-2.0.0:0
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
@@ -101,11 +102,16 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	>=sys-devel/clang-5
 	virtual/pkgconfig
 	dev-vcs/git
 "
 
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	DEPEND+=" >=sys-devel/clang-5"
+fi
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
@@ -381,7 +387,7 @@ src_configure() {
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX NM
 
-	if ! tc-is-clang; then
+	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++
diff --git a/www-client/chromium/chromium-71.0.3559.6.ebuild b/www-client/chromium/chromium-71.0.3573.0.ebuild
index 71d7284a09c2..4b58a52df69d 100644
--- a/www-client/chromium/chromium-71.0.3559.6.ebuild
+++ b/www-client/chromium/chromium-71.0.3573.0.ebuild
@@ -137,12 +137,13 @@ GTK+ icon theme.
 "
 
 PATCHES=(
-	"${FILESDIR}/chromium-compiler-r5.patch"
-	"${FILESDIR}/chromium-widevine-r2.patch"
+	"${FILESDIR}/chromium-compiler-r6.patch"
+	"${FILESDIR}/chromium-widevine-r3.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ceil-r0.patch"
 )
 
 pre_build_checks() {
@@ -322,6 +323,7 @@ src_prepare() {
 		third_party/skia/third_party/vulkan
 		third_party/smhasher
 		third_party/spirv-headers
+		third_party/SPIRV-Tools
 		third_party/spirv-tools-angle
 		third_party/sqlite
 		third_party/swiftshader
diff --git a/www-client/chromium/chromium-71.0.3554.4.ebuild b/www-client/chromium/chromium-71.0.3578.10.ebuild
index d01d061f6aba..849cee3f284b 100644
--- a/www-client/chromium/chromium-71.0.3554.4.ebuild
+++ b/www-client/chromium/chromium-71.0.3578.10.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+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 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+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/"
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.8.8:=[icu(-)]
+	>=media-libs/harfbuzz-2.0.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND}
 # dev-vcs/git - https://bugs.gentoo.org/593476
 # sys-apps/sandbox - https://crbug.com/586444
 DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
 	>=app-arch/gzip-1.7
 	!arm? (
 		dev-lang/yasm
@@ -101,11 +103,16 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	>=sys-devel/clang-5
 	virtual/pkgconfig
 	dev-vcs/git
 "
 
+: ${CHROMIUM_FORCE_CLANG=yes}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-5"
+fi
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
@@ -130,12 +137,13 @@ GTK+ icon theme.
 "
 
 PATCHES=(
-	"${FILESDIR}/chromium-compiler-r4.patch"
-	"${FILESDIR}/chromium-widevine-r2.patch"
+	"${FILESDIR}/chromium-compiler-r6.patch"
+	"${FILESDIR}/chromium-widevine-r3.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-harfbuzz-r0.patch"
 )
 
 pre_build_checks() {
@@ -154,14 +162,12 @@ pre_build_checks() {
 	# 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
+	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
-	eshopts_pop
 	check-reqs_pkg_setup
 }
 
@@ -262,6 +268,7 @@ src_prepare() {
 		third_party/iccjpeg
 		third_party/inspector_protocol
 		third_party/jinja2
+		third_party/jsoncpp
 		third_party/jstemplate
 		third_party/khronos
 		third_party/leveldatabase
@@ -317,6 +324,7 @@ src_prepare() {
 		third_party/skia/third_party/vulkan
 		third_party/smhasher
 		third_party/spirv-headers
+		third_party/SPIRV-Tools
 		third_party/spirv-tools-angle
 		third_party/sqlite
 		third_party/swiftshader
@@ -380,7 +388,7 @@ src_configure() {
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX NM
 
-	if ! tc-is-clang; then
+	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++
@@ -677,17 +685,21 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
 	xdg_desktop_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	if type gtk-update-icon-cache &>/dev/null; then
+		ebegin "Updating GTK icon cache"
+		gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
+		eend $?
+	fi
 	xdg_desktop_database_update
 	readme.gentoo_print_elog
 }
diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch
new file mode 100644
index 000000000000..9e7f2a7392e9
--- /dev/null
+++ b/www-client/chromium/files/chromium-ceil-r0.patch
@@ -0,0 +1,59 @@
+From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 8 Oct 2018 22:33:38 +0000
+Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ceilf() is only formally mentioned in C++17, even though previous versions
+of the standard say <cmath> should have the same contents as C's math.h.
+
+libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload
+that _is_ in the standard is available everywhere, so use that instead.
+
+This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed
+bottom and top stick to top"):
+
+    ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’:
+    ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’
+               std::ceilf(-total_controls_height * hidden_ratio));  // bottom
+                    ^~~~~
+    ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’
+               std::ceilf(-total_controls_height * hidden_ratio));  // bottom
+                    ^~~~~
+                    ceil
+
+Bug: 819294
+Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
+Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992
+Reviewed-on: https://chromium-review.googlesource.com/c/1264537
+Commit-Queue: David Bokan <bokan@chromium.org>
+Reviewed-by: David Bokan <bokan@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#597709}
+---
+ cc/layers/picture_layer_impl.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
+index 937255884a6e..020bcee55201 100644
+--- a/cc/layers/picture_layer_impl.cc
++++ b/cc/layers/picture_layer_impl.cc
+@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() {
+           1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio();
+ 
+       viewport_rect_for_tile_priority_in_content_space_.Inset(
+-          0,                                                   // left
+-          0,                                                   // top,
+-          0,                                                   // right,
+-          std::ceilf(-total_controls_height * hidden_ratio));  // bottom
++          0,                                                  // left
++          0,                                                  // top,
++          0,                                                  // right,
++          std::ceil(-total_controls_height * hidden_ratio));  // bottom
+     }
+   }
+ }
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-compiler-r6.patch b/www-client/chromium/files/chromium-compiler-r6.patch
new file mode 100644
index 000000000000..db8d04649fdc
--- /dev/null
+++ b/www-client/chromium/files/chromium-compiler-r6.patch
@@ -0,0 +1,170 @@
+From cec10e55fdb150b33342ad462907fb6202de364e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 25 Apr 2018 13:22:49 -0400
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 63 ++++++++++------------------------
+ 1 file changed, 18 insertions(+), 45 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 0f7a6b48f7b2..c91b702147d4 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -236,8 +236,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+   ]
+ 
+@@ -502,17 +500,6 @@ config("compiler") {
+     }
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
+-    cflags += [
+-      # TODO(hans): Remove this once Clang generates better optimized debug info
+-      # by default. https://crbug.com/765793
+-      "-Xclang",
+-      "-mllvm",
+-      "-Xclang",
+-      "-instcombine-lower-dbg-declare=0",
+-    ]
+-  }
+-
+   # Print absolute paths in diagnostics. There is no precedent for doing this
+   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
+   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
+@@ -1498,13 +1485,6 @@ config("default_warnings") {
+         cflags += [
+           # TODO(thakis): https://crbug.com/753973
+           "-Wno-enum-compare-switch",
+-
+-          # Ignore warnings about MSVC optimization pragmas.
+-          # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+-          "-Wno-ignored-pragma-optimize",
+-
+-          # TODO(hans): https://crbug.com/890307
+-          "-Wno-defaulted-function-deleted",
+         ]
+       }
+     }
+@@ -1546,22 +1526,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer &&
+-        (!is_linux || !is_clang || is_official_build) &&
+-        current_cpu != "s390x" && current_cpu != "s390" &&
+-        current_cpu != "ppc64" && current_cpu != "ppc64" &&
+-        current_cpu != "mips" && current_cpu != "mips64") {
+-      # _FORTIFY_SOURCE isn't really supported by Clang now, see
+-      # http://llvm.org/bugs/show_bug.cgi?id=16821.
+-      # It seems to work fine with Ubuntu 12 headers though, so use it in
+-      # official builds.
+-      #
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -1931,7 +1895,8 @@ config("default_stack_frames") {
+ }
+ 
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+   if (is_win) {
+     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
+     if (is_official_build && full_wpo_on_official && !is_clang) {
+@@ -1965,7 +1930,8 @@ config("optimize") {
+ }
+ 
+ # Same config as 'optimize' but without the WPO flag.
+-config("optimize_no_wpo") {
++config("optimize_no_wpo") { }
++config("xoptimize_no_wpo") {
+   if (is_win) {
+     # Favor size over speed, /O1 must be before the common flags. The GYP
+     # build also specifies /Os and /GF but these are implied by /O1.
+@@ -1988,7 +1954,8 @@ config("optimize_no_wpo") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2012,7 +1979,8 @@ config("no_optimize") {
+ # Turns up the optimization level. On Windows, this implies whole program
+ # optimization and link-time code generation which is very expensive and should
+ # be used sparingly.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2059,7 +2027,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2097,7 +2066,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   ldflags = common_optimize_on_ldflags
+   visibility = [ ":default_optimization" ]
+@@ -2183,7 +2153,8 @@ config("afdo") {
+ #   configs += [ "//build/config/compiler:symbols" ]
+ 
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+   if (is_win) {
+     if (use_goma || is_clang) {
+       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
+@@ -2281,7 +2252,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+   if (is_win) {
+     # Linker symbols for backtraces only.
+     cflags = []
+@@ -2321,7 +2293,8 @@ config("minimal_symbols") {
+ }
+ 
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (!is_win) {
+     cflags = [ "-g0" ]
+     asmflags = cflags
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-harfbuzz-r0.patch b/www-client/chromium/files/chromium-harfbuzz-r0.patch
new file mode 100644
index 000000000000..2d5602de280d
--- /dev/null
+++ b/www-client/chromium/files/chromium-harfbuzz-r0.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc     | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc    | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h     | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+                                                void* font_data,
+                                                unsigned count,
+-                                               hb_codepoint_t* first_glyph,
++                                               const hb_codepoint_t* first_glyph,
+                                                unsigned int glyph_stride,
+                                                hb_position_t* first_advance,
+                                                unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+   return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+ 
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++  return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ }  // namespace
+ 
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+ 
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+-                                               hb_codepoint_t* glyphs,
++                                               const hb_codepoint_t* glyphs,
+                                                unsigned glyph_stride,
+                                                hb_position_t* advances,
+                                                unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+   // array that copy them to a regular array.
+   Vector<Glyph, 256> glyph_array(count);
+   for (unsigned i = 0; i < count;
+-       i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++       i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+     glyph_array[i] = *glyphs;
+   }
+   Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+ 
+   void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+   void GetGlyphWidthForHarfBuzz(unsigned count,
+-                                hb_codepoint_t* first_glyph,
++                                const hb_codepoint_t* first_glyph,
+                                 unsigned glyph_stride,
+                                 hb_position_t* first_advance,
+                                 unsigned advance_stride);
+-- 
+2.19.1
+
diff --git a/www-client/chromium/files/chromium-widevine-r3.patch b/www-client/chromium/files/chromium-widevine-r3.patch
new file mode 100644
index 000000000000..a126084563ce
--- /dev/null
+++ b/www-client/chromium/files/chromium-widevine-r3.patch
@@ -0,0 +1,23 @@
+From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Sun, 14 Oct 2018 20:04:03 -0400
+Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING
+
+---
+ third_party/widevine/cdm/widevine_cdm_version.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
+index dd6efed02646..eaa017197e61 100644
+--- a/third_party/widevine/cdm/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ 
+ #endif  // WIDEVINE_CDM_VERSION_H_
+-- 
+2.19.1
+
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 543a7b02afd1..fad1a596d317 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -291,5 +291,5 @@ DIST firefox-62.0.3-zh-TW.xpi 494524 BLAKE2B 491437706ecf92a563e79735ea7ddd91d60
 DIST firefox-62.0.3.source.tar.xz 259531444 BLAKE2B 94dc812e288054f230ec0faae44155e6a9d5e72fc5bcb78341d61f8391d17d72d3731c7fffb66c2a59cb572f8b18458c5fbabaa94779d48b5660db245aedba14 SHA512 487bb7791284367158c79cf7918fecf3d598627a6416e679aeb5d22626089aeffe07762fa2389819ba881c90ece1c5a83cf2d85b2def15b8d5ba0ed1c498b527
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.2.2.ebuild 13107 BLAKE2B a183f3234bb013310915a8a5a8245b99162e88c6ccb82563f64de1063b3f3acc1815f5ac3c931f75d2df43de0c15d7c42c53c2aecc6338f4a188a30970ba259c SHA512 a6189cd01791e445c1fe1df101d9040ba8e49ebc7dfe43c5a031c109b97531383fe0b0e26c1f6ba426234f9cffd3f744000086a971d50c16455211ab45d941ec
-EBUILD firefox-62.0.3.ebuild 19851 BLAKE2B c3f3127c87429c817c9a3cbbe5fe74fcbade36a73e573a459a25ca47ea95121631ff9889dccde2c0941ba9d61de056001bdaf4a5b767c6c1fa87961f6f338370 SHA512 ac463f1e22fc5567b57e350a2d60e09f1a3115ff143119a495b5574ac4fb8881d0445e69c9219cf20a64cb489f0631b77b4de93ec829276a02141b6cf8975a49
-MISC metadata.xml 2347 BLAKE2B ea74b91ed7af45d318660870984f9b9c4ebca2559801499bbc2249cefa694bca53a1a6dbb126cc606b4784b6a8c0ee1f1f2178dd03584fc28eca2a5204c4ad6a SHA512 3450f2c8fbf1d41755fe6b649eaa370dd93d4367b7ff151582699cfeef013dcd8eddf649cfc220da8567f9123eb11a7e484e85176f8d892580b703510e76f81b
+EBUILD firefox-62.0.3.ebuild 19851 BLAKE2B f13453406e28a5b0b302c6ddea7e39c073525485154b918f72853898957f9e88970814ddfb19a7fbd8413ed9aa4e36ac5c20f363d9e9034944baa4e634cd5aac SHA512 80ff07001e11c40108fea368666c724f49af5805ff7cd2b1c9b087925230023923e7ce632d8a523e01f5d07bd37af38b5fc86888b4d19e756dd331addbaf7b7d
+MISC metadata.xml 2290 BLAKE2B b820d2a49926c5b313d55161a92e94ef88638a2c21d80d346a0cea93d2d9d2f6e81f23c45d4f4b759357f19d91f4162445deda77e8ef7dcc87fb5bafc4bef930 SHA512 42513d5043efca1f8cf3cd6e9114a84c2013c3f782dfdb0f2c1c3a27b0b1d95d889f032b0df7b75a3c97d07782f70fdc316e2944fafb2a140d191ae4127857a7
diff --git a/www-client/firefox/firefox-62.0.3.ebuild b/www-client/firefox/firefox-62.0.3.ebuild
index 98a5c00667ab..1b23c6994a07 100644
--- a/www-client/firefox/firefox-62.0.3.ebuild
+++ b/www-client/firefox/firefox-62.0.3.ebuild
@@ -299,7 +299,7 @@ src_configure() {
 			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
 		fi
 
-		mozconfig_annotate '+lto' --enable-lto=full
+		mozconfig_annotate '+lto' --enable-lto=thin
 	else
 		# Avoid auto-magic on linker
 		if use clang ; then
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index c8b46b53b3bc..a4a9dced62e9 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -17,7 +17,6 @@
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
-	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 8a20966ba2a0..6de691ca4ea4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_70.0.3538.35-1_amd64.deb 57135036 BLAKE2B 32bb60b0391b0736b9d466ea7a41c2a3234e5294362da44e72e4c20078fa0ed4e4acb5871174b22e9ed505cde3a8bb6585c80863d7fed3c9071536519d8a06e9 SHA512 751843d0ad0d74586b9100c07a29579509e56694972eef089697df8dd05128484bd2bdd656bcbaacd6f90177ec3dd6cecd39b1df095ec7936abffe2ee6161223
-EBUILD google-chrome-beta-70.0.3538.35.ebuild 2712 BLAKE2B ab39deb472a45e85a570997a8bdac2d42e014b2fdef04115eaac90f4ae0b5d5e23fff628653d181f470e51915434e894c4d3249b643922fe9e83d2f10e76a02c SHA512 17d349603f6ace9267591e71c95ea6960d02723fb6b55c7281631de51dd8dd0344134d5064a754a6af01382e871872d9483715bf370aa8b98d70663740002c96
+DIST google-chrome-beta_70.0.3538.67-1_amd64.deb 57157608 BLAKE2B 6ae713e29bc49d3c2526032e0eff9d310addcb9543f06b61fd1284358282137aabf9a394f81369d028ea7d73bdbec8bfaafd71e0ff8055e9b69c722582e586e5 SHA512 120674dfdc2f059ed863f7c2cb28b8d417206c58979fd5f24bc880c69c2574f4001b2452146aebb8f5ac0c76527dcf5a3c98c9df1cf54f13fa7f5aa9dc10aef8
+EBUILD google-chrome-beta-70.0.3538.67.ebuild 2712 BLAKE2B ab39deb472a45e85a570997a8bdac2d42e014b2fdef04115eaac90f4ae0b5d5e23fff628653d181f470e51915434e894c4d3249b643922fe9e83d2f10e76a02c SHA512 17d349603f6ace9267591e71c95ea6960d02723fb6b55c7281631de51dd8dd0344134d5064a754a6af01382e871872d9483715bf370aa8b98d70663740002c96
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.ebuild b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.67.ebuild
index 3a03ee42c9b5..3a03ee42c9b5 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.67.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 754862b47a07..7219f4994e4b 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_71.0.3559.6-1_amd64.deb 57503184 BLAKE2B 48fdb39d3523e1cd58641d57a7fd10172c67879fbcf327a68fdf76b4ce7adfbeddced03136f2a89d9012cfd27d79bd32c20f7c158d6541be5dcbc0180791beb9 SHA512 30367f713bb283df64c157f01bb9c3d6dc393546255558f331d5aca8b886d213d2f5b990536468a57979c7fc2fd89350abe32d47dbc1a4ebffa4055a2193ad4e
-EBUILD google-chrome-unstable-71.0.3559.6.ebuild 2691 BLAKE2B 396276e8de230d6c5f78b02d6bd6a1f06e8a3313f08f9c8dc125ac8d59fc23bbf212a0eb3e09944cb411d6b16baec64d6d3e98f916512753228f170e5a0ffa65 SHA512 ebd353de2344e6e574a2d2e5180b98334ec52f0f9d245f0a7dc1d035afeebf4d4bcfc58fe8b3305172d6ee8d6493162eba751d8816b3e4afa220307f5f09a839
+DIST google-chrome-unstable_71.0.3578.10-1_amd64.deb 57838364 BLAKE2B 786ab75466be4be8bcc6fcb13c57c1292ee27a78c84b6c4c1cdfda43677d652de69cba7dda7f07a6177000111b8495a504e9375f1656c656a7532dcd41f22f66 SHA512 3d95c702e080d0a3b575cc17eb6659e4d350d7a8d7d24f1c841bc4a844ca26b6f0ff991f851d60fe260df564a8a42e3793617d582fc72fcda98b1c72c6486ce2
+EBUILD google-chrome-unstable-71.0.3578.10.ebuild 2691 BLAKE2B 396276e8de230d6c5f78b02d6bd6a1f06e8a3313f08f9c8dc125ac8d59fc23bbf212a0eb3e09944cb411d6b16baec64d6d3e98f916512753228f170e5a0ffa65 SHA512 ebd353de2344e6e574a2d2e5180b98334ec52f0f9d245f0a7dc1d035afeebf4d4bcfc58fe8b3305172d6ee8d6493162eba751d8816b3e4afa220307f5f09a839
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3559.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3578.10.ebuild
index 57fa25d49a63..57fa25d49a63 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3559.6.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-71.0.3578.10.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 25a8b48c9bc6..24d2a250dfcc 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
-EBUILD google-chrome-69.0.3497.100.ebuild 2709 BLAKE2B 1d0e19dba3750d8f89e3b7fd99f3d3f353e183c466bcbe0db4a9f83453dbb3da18829973eece4311a22cf6f8d2e83d311bef9c379101632910e847e6226d7bc8 SHA512 10f86cdf637aa0489c6fa90de462309419085d86b7cbf0634c5baa60a4d764af7064dbc4d5338c4cfe8c137345478e4023f7e1adafca91f66c7a2977256a0aa2
+DIST google-chrome-stable_70.0.3538.67-1_amd64.deb 56079500 BLAKE2B 3835e5b088b9259ea32ed6689f0ed670e21841a35a34be741fd8ae47ad16d7f1642cb49e2e2a7fba23695a2578b1bb9bfa1fc4a57c0dca61fbd9c85ca4b3a008 SHA512 8f11a8a0caa6ce95d2f21b408ac70c4da1852465958e2515f874be6c55a8f109754e680f52cf81bd7aef691aa693d036fbcd1ae4f5d024213fc8de38d52ae66d
+EBUILD google-chrome-70.0.3538.67.ebuild 2706 BLAKE2B c93c05c189187d3b623b8434b571340ee661d685a66e62bc2071e850c36d9c2f68f4ee56bc5c09a31db76b349dc89935a1bfacdce4b39a76924b06c9d57fd41d SHA512 d1e16148ce0892ac1ff4e14061ab2b3f66c4e3fa39e28b051090836ca9f7bc992e24329920e5a2a0c603cb8887eedfa499a2c44f7bd702eb7a1c359676d49bd4
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild b/www-client/google-chrome/google-chrome-70.0.3538.67.ebuild
index 806c156e4b16..d7d8f612b2b9 100644
--- a/www-client/google-chrome/google-chrome-69.0.3497.100.ebuild
+++ b/www-client/google-chrome/google-chrome-70.0.3538.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ed3a37130f5a..ea87dc7377dd 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,8 @@
-AUX netsurf-3.6-CFLAGS.patch 1821 BLAKE2B eb0bfa30abb7dc23845a6ade5edec90a607019298d917932ddcbfcb13e1c468f453eb256719c33e2494b0bee6858600d6d2b9b9ca93735029410bf67b5c582c4 SHA512 4eed05c11dc548cce4a0d88fcff547d8efabf3d2bab2067136585fefc5b96ee79be318304c31ed7aa5bebca479d8af082198059de9a05782eb939f0c3f8338e9
 AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.6-gstreamer.patch 900 BLAKE2B 1182c00378c796e9ca11b0070094b8b2dc7ce17b47ecd58a264125a7b672b22c802d3c1bf42401f477de3b734563ea97e3e4f04391491925c22dd9f33ca31306 SHA512 9dd8510cc343c2b627001e7ec80603d8e0de8cb4bbd1e8f53e8ffea5b2adfa915633e50a0b6d99b13a453d3375fa66cfb466658931a0f5454f36363d56d53bb3
-AUX netsurf-3.6-pdf-writer.patch 2408 BLAKE2B 65c4356531d7de89708e0ffe79f900e95d74cdce383621b7d41afacd0ca516bc3abab7da85b6c29e6db0eff1d6e0f8fada2e1c343c7551a11b87009886caea7c SHA512 d3aee4ce0b509743a7efbf2262ca4ae64564d5e4b01453c621868eba20ef97bef8322a042a27606196456be38f09a7ca6be82fee3747cb93140e24b265133225
-DIST netsurf-3.6-src.tar.gz 4129091 BLAKE2B d6b08069e34a8fd4f2010c6b3efbde9d7b13e40d3f3fdceeee92eb9d2bbeb92fac6f0a1ca9ac263ebc1904ad04a42c97a6418da7e095d18eda3be952129ac718 SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
+AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981
-EBUILD netsurf-3.6.ebuild 6584 BLAKE2B 0ad265b70d65e1e3fde6529fb75de17c7e5faa0682e73fb490935692614de0500f47ae532330589a81e0c72699eea9509348b316176a4b335fe7b519ab4ae6aa SHA512 5c0ca0d136ef9b2ed899a0626409117288f60424e1c6aee1ef0e0afc9ce32cf51384c9b861498fc13d487282fb705f3f9748e0dc9f557ea3d77e1e296e9ea553
-MISC metadata.xml 1855 BLAKE2B e4c0c4b14d68ce4f9036c984a6f543211b69bcd5e519eb7e889d75766d5bebb54cd4a40fd3af0c301061ded8f108a2f884b8f62bdb5409c3212a4c5f658fa111 SHA512 bef58b8b699cd7d7259c6affd5fb4a12f0358b57b9a1e0b7db938a7ef5c633c82acd5136b047b42f55794cc9c555825bd7a407c9a15d2ade72ba2d1d831e21c1
+EBUILD netsurf-3.8.ebuild 6404 BLAKE2B 903bc25775d1b5aa09f154b8e6e6b846f3e407caeb5c0d38d7764fe7ebe9b55a524cb4f9d72461f5e328461325299363ce33dd2e2eba59aa7db4683041749211 SHA512 2e35e4adf4c2c5e99beb3777136bbc15d13291326f92a4a63e41213d6a87507703ba8452d5c6bbf74b07c48d6378e9c6027fdb91bd974d2f8e67fadbd23f4b4c
+MISC metadata.xml 1903 BLAKE2B 2bbf38d061d0e1ad59c99b451f008619553442c436fa065f2066c964d9189d805f38b6571f7f54aeaa9d2512c403d2b4390afaed4a5559f5b273720aae416562 SHA512 79648e993db4b42d50244d1ec3efcb781d7c12f41f01056de5ce88aec9884bf6f23408421823970ccb3e46211d39736ae997f2e18a3d883a9cf553bb93923636
diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
deleted file mode 100644
index 8004aa4c6206..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.6/Makefile.defaults
-+++ netsurf-3.6/Makefile.defaults
-@@ -96,12 +96,6 @@
- # Valid options: YES, NO
- NETSURF_FS_BACKING_STORE := NO
- 
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
- 
---- netsurf-3.6/frontends/framebuffer/Makefile
-+++ netsurf-3.6/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- 
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- 	  -D_BSD_SOURCE \
- 	  -D_DEFAULT_SOURCE \
- 	  -D_XOPEN_SOURCE=600 \
---- netsurf-3.6/frontends/framebuffer/Makefile.defaults
-+++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
---- netsurf-3.6/frontends/gtk/Makefile.defaults
-+++ netsurf-3.6/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
---- netsurf-3.6/test/Makefile
-+++ netsurf-3.6/test/Makefile
-@@ -105,7 +105,7 @@
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--TESTCFLAGS := -std=c99 -g \
-+TESTCFLAGS := -std=c99 \
- 		$(COMMON_WARNFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
deleted file mode 100644
index 6aca4f6abdf9..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 		-DGTK_MULTIHEAD_SAFE \
- 		-DPANGO_DISABLE_DEPRECATED
---- netsurf-3.6/content/handlers/image/video.c
-+++ netsurf-3.6/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
- 
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
- 
- typedef struct nsvideo_content {
- 	struct content base;
---- netsurf-3.6/content/content_factory.h
-+++ netsurf-3.6/content/content_factory.h
-@@ -25,6 +25,7 @@
- 
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
- 
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
- 									\
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
new file mode 100644
index 000000000000..c52422dcb92b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile.defaults b/Makefile.defaults
+index 51090109e..f1ec46f73 100644
+--- a/Makefile.defaults
++++ b/Makefile.defaults
+@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
+ # But recover after sanitizer failure
+ NETSURF_RECOVER_SANITIZERS := YES
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+-CXXFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
+index bdedd903b..35179138a 100644
+--- a/frontends/framebuffer/Makefile
++++ b/frontends/framebuffer/Makefile
+@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
+ CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
+ CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
++CFLAGS += -std=c99 -Dsmall \
+ 	  -D_BSD_SOURCE \
+ 	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
+index cc712e992..f132c97d6 100644
+--- a/frontends/framebuffer/Makefile.defaults
++++ b/frontends/framebuffer/Makefile.defaults
+@@ -3,7 +3,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+ 
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
+index ec60ce70c..04af6df8f 100644
+--- a/frontends/gtk/Makefile
++++ b/frontends/gtk/Makefile
+@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+ endif
+ 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_DEFAULT_SOURCE \
+diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
+index a98043eb9..bb5371230 100644
+--- a/frontends/gtk/Makefile.defaults
++++ b/frontends/gtk/Makefile.defaults
+@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
+ NETSURF_GTK_MAJOR ?= 2
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+diff --git a/test/Makefile b/test/Makefile
+index 4f9dd22c9..8bec9b88a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
+   COMMON_WARNFLAGS += -Wno-unused-parameter
+ endif
+ 
+-BASE_TESTCFLAGS := -std=c99 -g \
++BASE_TESTCFLAGS := -std=c99 \
+ 	$(COMMON_WARNFLAGS) \
+ 	-D_DEFAULT_SOURCE \
+ 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
index 5824adc1ecbf..e9c2420a33fd 100644
--- a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
+++ b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
@@ -1,5 +1,7 @@
---- netsurf-3.6/desktop/font_haru.c
-+++ netsurf-3.6/desktop/font_haru.c
+diff --git a/desktop/font_haru.c b/desktop/font_haru.c
+index 4ee9824f0..3304ba82a 100644
+--- a/desktop/font_haru.c
++++ b/desktop/font_haru.c
 @@ -37,7 +37,7 @@
  #include <hpdf.h>
  
@@ -9,8 +11,10 @@
  #include "desktop/font.h"
  #include "utils/log.h"
  
---- netsurf-3.6/desktop/save_pdf.c
-+++ netsurf-3.6/desktop/save_pdf.c
+diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
+index 889190089..9e6265cfb 100644
+--- a/desktop/save_pdf.c
++++ b/desktop/save_pdf.c
 @@ -60,6 +60,8 @@
  #include "utils/useragent.h"
  #include "content/hlcache.h"
@@ -20,7 +24,7 @@
  #include "netsurf/bitmap.h"
  
  #include "netsurf/plotters.h"
-@@ -450,11 +452,6 @@
+@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
  
  		switch(content_get_type(content)){
  		/*Handle "embeddable" types of images*/
@@ -32,7 +36,7 @@
  
  		/*Disabled until HARU PNG support will be more stable.
  
-@@ -700,7 +697,7 @@
+@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
  
  
  #ifndef PDF_DEBUG
@@ -41,7 +45,7 @@
  		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
  #endif
  	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +771,7 @@
+@@ -780,7 +777,7 @@ void pdf_end(void)
  	assert(settings->output != NULL);
  
  	/*Encryption on*/
@@ -50,7 +54,7 @@
  		guit->misc->pdf_password(&owner_pass, &user_pass,
  				(void *)settings->output);
  	else
-@@ -789,7 +786,7 @@
+@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
  {
  	nserror res = NSERROR_OK;
  
@@ -59,9 +63,11 @@
  		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
  		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
  		free(owner_pass);
---- netsurf-3.6/frontends/gtk/scaffolding.c
-+++ netsurf-3.6/frontends/gtk/scaffolding.c
-@@ -731,14 +731,14 @@
+diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
+index 8c46fd884..748518fdc 100644
+--- a/frontends/gtk/scaffolding.c
++++ b/frontends/gtk/scaffolding.c
+@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
  
  	free(url_name);
  
@@ -70,7 +76,7 @@
  	strncat(dirname, "/", PATH_MAX - strlen(dirname));
  	dirname[PATH_MAX - 1] = '\0';
  
- 	/* this way the scale used by PDF functions is synchronized with that
+ 	/* this way the scale used by PDF functions is synchronised with that
  	 * used by the all-purpose print interface
  	 */
 -	haru_nsfont_set_scale((float)option_export_scale / 100);
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index e53232c547c3..a35fcb05331d 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 <upstream>
 	<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
 </upstream>
@@ -18,7 +22,6 @@
 	<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
 	<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
 	<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
-	<flag name="webp">WebP image support (media-libs/libwebp)</flag>
 	<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
 	<flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
 	<flag name="gtk2">Build GTK2 GUI</flag>
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.8.ebuild
index 4397fe9dfaa6..5722a925d819 100644
--- a/www-client/netsurf/netsurf-3.6.ebuild
+++ b/www-client/netsurf/netsurf-3.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="a free, open source web browser"
@@ -16,7 +16,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 gtk3 +javascript +jpeg +mng
 	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
 	fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
 
@@ -26,26 +26,25 @@ REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
 		fbcon_frontend_vnc fbcon_frontend_x ) )
 	duktape? ( javascript )"
 
-RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
-	>=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/libnsutils-0.0.5[${MULTILIB_USEDEP}]
+	>=dev-libs/libutf8proc-2.2[${MULTILIB_USEDEP}]
 	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
 	net-misc/curl[${MULTILIB_USEDEP}]
-	>=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
-	>=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
-	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
-	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.8[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3[${MULTILIB_USEDEP}]
+	>=net-libs/libdom-0.3[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.2[${MULTILIB_USEDEP}]
 		truetype? ( media-fonts/dejavu
 			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
 	)
-	gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/libnsgif-0.1[${MULTILIB_USEDEP}] )
 	gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
 	javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
 		!duktape? ( dev-lang/spidermonkey:0= ) )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -61,19 +60,23 @@ DEPEND="${RDEPEND}
 	dev-libs/check[${MULTILIB_USEDEP}]
 	dev-perl/HTML-Parser"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.6-pdf-writer.patch
-	"${FILESDIR}"/${PN}-3.6-gstreamer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
-	Docs/ideas/{cache,css-engine,render-library}.txt )
+	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( fb.modes README docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt )
 
 src_prepare() {
-	rm -r frontends/{amiga,atari,beos,cocoa,monkey,riscos,windows} || die
+	# working around broken netsurf eclass
+	default
+	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
 
 	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
 
-	netsurf_src_prepare
+	multilib_copy_sources
 }
 
 src_configure() {
@@ -115,12 +118,12 @@ src_compile() {
 	fi
 	if use gtk2 ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_compile
 	fi
 	if use gtk3 || use gtk ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_compile
 	fi
 }
@@ -134,7 +137,7 @@ src_install() {
 		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
 		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
 		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
 		elog "Please make /dev/input/mice readable to the account using netsurf-fb."
@@ -142,17 +145,17 @@ src_install() {
 	fi
 	if use gtk2 ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
 	fi
 	if use gtk3 || use gtk ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
 	fi
 
 	insinto /usr/share/pixmaps
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a62e167653dd..4a6d0701a123 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,5 @@
-DIST opera-beta_56.0.3051.28_amd64.deb 56825330 BLAKE2B d4e68402793db977f1a9722140802e755e65a208e9b99e497132aa3ecb65fa6df5b5b10be160c08a933929e6d132c0af7ccf2148fbc8c52cc4ebf8179f6effda SHA512 8933173f70425997f4ec35864f05d7bd60002516be1095685d86887019bdd451b55b207a16fbdd6b3a49f5e1cca98b8b58277c23ea4ff011385473d14eb221d1
-EBUILD opera-beta-56.0.3051.28.ebuild 2321 BLAKE2B c69702f75840d6023471010024926366e861d5e0dcb330a49faaea5cc32aae4d82af89abc62360592f80f73fc6701fedb300b381d1cbd2c697edf8d95881544a SHA512 923d0cd12aec9f692c1768d6a789b2e7bafb026e7d3b17d213414d87105b915f0be8f9315ff32e90663554416e0a9cd323a12e33e442e0b772a9210de3b2942f
+DIST opera-beta_57.0.3098.14_amd64.deb 69960852 BLAKE2B 98009e5ce89c4bc5c6375de6e2448fecaa31fcf52ba08aa8d9265db0c28c059199e1bbaf29aba545df15342b407882b462f8809a6f7805b14d61f7712d97c1e5 SHA512 168576ecb02581af0ddc347f6d17d9e1627c356a9c025083c483cce31aa6f442517812f119eb4b115c4f4ef2183f983e0d88b560863cc2bcf2de36cbe422d433
+DIST opera-beta_57.0.3098.6_amd64.deb 70093468 BLAKE2B 934b90347ba9e8b456a161a8c72e57d51798da46202e959c07ab0e4cbb33dd16bd824e1b04a487eb2c7df887cf6386dce5e00406da6a59cd61d4f88ddce496cc SHA512 c4b11d4fff600b3fc7637fd5a02a72d0d0367271602fc4f61da8df376bf6e25074c25566757719c44da5967571a6216c7dfc5ae438aaf033d0b008843dbf8d7e
+EBUILD opera-beta-57.0.3098.14.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-beta-57.0.3098.6.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-57.0.3090.0.ebuild b/www-client/opera-beta/opera-beta-57.0.3098.14.ebuild
index c09ad3685d1c..c09ad3685d1c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3090.0.ebuild
+++ b/www-client/opera-beta/opera-beta-57.0.3098.14.ebuild
diff --git a/www-client/opera-developer/opera-developer-57.0.3098.1.ebuild b/www-client/opera-beta/opera-beta-57.0.3098.6.ebuild
index c09ad3685d1c..c09ad3685d1c 100644
--- a/www-client/opera-developer/opera-developer-57.0.3098.1.ebuild
+++ b/www-client/opera-beta/opera-beta-57.0.3098.6.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 9c4699c1d113..99c163bccfb0 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_57.0.3090.0_amd64.deb 69308000 BLAKE2B 1309205234788452f333f18bbf55d0d4d795e433f9cbf95ada7417597db4d6bb90aeb510402a9669f8188c6689eb5b3976f831312659454f7565ebf2399bbe9f SHA512 9c33f1c171543f56fa1a26369ca0fe8a393d180e46c7edc4224a0fc74a19345b8f9236abe556f858b76bb00baa351c5c5d0cc5cc16c70bc3afa659e64a24d88e
-DIST opera-developer_57.0.3098.1_amd64.deb 69970320 BLAKE2B 32190e19c4c4771401ad6963e567f1c0c5e09f2bea57fcc7c0381af1c8505cf2f53e4c7f4fc339ee4d5e49197d72457c0bbcf962aba0d24033258654eb255c05 SHA512 2b85fdc5bca06bbdd55258fb786bed59ae4799c15025659daceb2e44b29fe520205ed49d3c9fa300e985031f3cd3d53be0343a3b12671158b71cd42c6186908a
-EBUILD opera-developer-57.0.3090.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
-EBUILD opera-developer-57.0.3098.1.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-developer_58.0.3105.0_amd64.deb 70419486 BLAKE2B 7c3b8ac9ece6c124cb5016f99a260be4416d99fc36a2c6bd02ac2fce3161ddfb51ec094ee9722081055b3ef78ad568b3b7b6a75351ea72bdab42645739dda65c SHA512 76b29d408dcf6115807ce75f318f0b37fb16da32125d7e859e00ef5f5ba1c0b38dc0b9e5af8251bc013cc4a3f1050ba5af3b923b17ce00b820e5bd983ca5d89c
+DIST opera-developer_58.0.3111.0_amd64.deb 69837552 BLAKE2B 1146bb9b7e8ffe4e3e7e352957f26e8bc77194f61e6c959d24538815e11aaf448984065a55e6c0de85eca5be8a04fea4dd0da6c6f196596c1b62eac1e8bf2d2a SHA512 8228d15efe92f29908190d2bdeb819d3b5b1b734a7e7db9287b5601d4a4b4f706da9a4327ffe8066e757094ddfb4888c42f1d5a52fbd6aeb121d9657e5e0b716
+EBUILD opera-developer-58.0.3105.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-developer-58.0.3111.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild b/www-client/opera-developer/opera-developer-58.0.3105.0.ebuild
index 7febec80c8f9..c09ad3685d1c 100644
--- a/www-client/opera-beta/opera-beta-56.0.3051.28.ebuild
+++ b/www-client/opera-developer/opera-developer-58.0.3105.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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
+	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
 "
@@ -67,6 +67,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch_user
+
 	case ${ARCH} in
 		amd64)
 			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
@@ -77,10 +79,10 @@ src_prepare() {
 			;;
 	esac
 
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
 	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
diff --git a/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild b/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild
new file mode 100644
index 000000000000..c09ad3685d1c
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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 gnome2-utils 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}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	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_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/Manifest b/www-client/opera/Manifest
index 63e0bdd29b00..21cb29470bff 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_56.0.3051.31_amd64.deb 56660522 BLAKE2B 2f216399e9e74e65d7cdc3fb813097241924e06e30c483a9cead56097a324ab97260b95a6cb746a5d52eab58687ca5a5aea71c63f5739603a50ab2082afd381f SHA512 53ebbd077068feededcf1bd1be9da339b3e8c8665665d22cb3347ec80b8bfc625911218e9bbf72b6f5420fe9fd3a7726ed68cc41ab3f7019e1b416586e7ac4ae
-DIST opera-stable_56.0.3051.36_amd64.deb 56664360 BLAKE2B c815479fa67b3333585eef6a261a4fcce974a31a07427455f2817f0bc6277cd2778ec8dd3558da16e60b316225e7f5ebf8a1c52a3e9931383fc0b36d55e793fc SHA512 269654bcc590c5bf40e7998f9fe1940a47374c04de10b5b7c740828509dae72303f0975a0c889c648fc6c3297d994c2a1997ffdafb17e11e987e13fef87e1a92
+DIST opera-stable_56.0.3051.43_amd64.deb 55966290 BLAKE2B 8c4f9b3584974a93ad2fd9b170ed19b3836ebadb17e9266726f617e3002808029615bcc78a87487191fbcd5adf9b349c35fff471cc69c7da3d83ebc798fb2a74 SHA512 24c8682e7f41d5f62ded79fadf3dc04e74c1226481ede09c0b5442268d69aac84a3f713194648ffe6e802d12539ffa404dd8ec6df75395509b85e4547f72e0c2
+DIST opera-stable_56.0.3051.52_amd64.deb 56675592 BLAKE2B cbaafec8c8a4132187bfab9a13f66bb1ffdf5e9e677dcbda39f0953d0ce7768adfa65ed4ab19155f7da6e35d96848f8f836c630c620fba875f246a51bb999d60 SHA512 76869c151c37dfedaa4fcacb6f1a38ddcbb6cfec36dfacaad7e12977c3f2e1be706dc2820201f38f98391d469a5a3ca0ce15a61e1b04b5b74a6c3be375f94bc4
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-56.0.3051.31.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
-EBUILD opera-56.0.3051.36.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-56.0.3051.43.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-56.0.3051.52.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-56.0.3051.31.ebuild b/www-client/opera/opera-56.0.3051.43.ebuild
index 89d2858058e3..89d2858058e3 100644
--- a/www-client/opera/opera-56.0.3051.31.ebuild
+++ b/www-client/opera/opera-56.0.3051.43.ebuild
diff --git a/www-client/opera/opera-56.0.3051.36.ebuild b/www-client/opera/opera-56.0.3051.52.ebuild
index 89d2858058e3..89d2858058e3 100644
--- a/www-client/opera/opera-56.0.3051.36.ebuild
+++ b/www-client/opera/opera-56.0.3051.52.ebuild
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index c1c57b30d2df..4026bdc8256f 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,6 +1,6 @@
 DIST pybugz-0.12.1.tar.gz 25606 BLAKE2B 907a87346dbe0a949c3cf2c1b8e601dfbc0a1122c0647e8fc9de25b097fb5f31f39dd99016ee2febde11ac58f5cfb527127331e53f71fef3ad64de213664afe0 SHA512 bb76baf8105f4b56b106c3e63f5aebb322659141edf9c5e5af747db5824abffb7b127703ecb7111f9480d05bdb2f11b3fef2cd5f99078d9dda00e841b4ce7394
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
 EBUILD pybugz-0.12.1.ebuild 1109 BLAKE2B 1dc0497d725e601115955e0ed30c3675c584ea58cfa6db3052ea7a042f506cf9106c1dd148fb06b2ec9810c363f49d209acbc27f786bb880933782d883b7c711 SHA512 ba6414e1c15fab1ee7770afe9229f22b976e71eed1952efab6f9e3cee02146d83db8b60d81f041a70f70716bceeb10c984b4ef7b634588bf511df306badfecd4
-EBUILD pybugz-0.13.ebuild 1105 BLAKE2B 1f56186aa9053ae3c5a57a2357d3c191d070b47a7cf523cdb4550ce8c817a9f10bcef30ff440a5d4586e71e94587ca58cae04731eb9202cc56c066076aab8732 SHA512 e0e2bd50a53be0ad976fb16c6adc7b3e359c9a9d62a463fa7c5ce8c55294947ffbe6d72b5a4373a58f2523296ae44ad5526e2c773d2da4d529590e92e739eba9
-EBUILD pybugz-9999.ebuild 1114 BLAKE2B 2f251d1ba88f4744d3c86f165801c03657d472f613822e6c0cfd82eb3d5ee618c657b103aa5be7db652f0743b4f00e2c2247d527244d60ef863c42f5777ac424 SHA512 16a4d899163f01387c6dffbfc300f0304dfba442ac22eaf6760813b9c26ffc91fffeea0903e25ff243c9e967fec4846235e8d17a315cac6bc3b4f5665441c6df
+EBUILD pybugz-0.13.ebuild 1104 BLAKE2B c12424095f8be8a1db82d52796f7ac0a5e70c70728a5aa5b14ce619382ee1d216f67584b424fcc9b62478975a6f7a0513436b73801db97771d73fbf5b3077429 SHA512 f2b48966e46b29347ca820cf3364194274de2276653ccdca6796cff7c434e330c84aa94cb39a3c20287bd5f90c6426680b11f69e7ddc94c069446553b273c051
+EBUILD pybugz-9999.ebuild 1113 BLAKE2B b12a63d93396c78ba067ac046f660e0cfb6e3740987894f7b27fe103fb978483bfafbf355544a9bbb4cb568c327345667e8731e96466793e591dd51c6aaa9083 SHA512 1baeebfa9c4048dba6a80c6da48776fc0ce5d3afc786c6d171f40e54b77d4b9f4153ecb99a83af63684f1d92d708304507476af03bcc9d2316aaef704fff8215
 MISC metadata.xml 307 BLAKE2B 35d9a21eb8997a7ebed4e14a088ac85802c9828d3d968adc0b41b1c7f5a54d863747cd32a96624785e16caecb6ca0a5b645aec61459c19ce746bedd67000a3a6 SHA512 ae4880029f219b2a1db5b8975ae0b442eb23d9059bdf5798f79d2f23a7d43bdd5efd7e8c626cb3dc642936f7ae84bbdf66d9509cd96e5c986bba136c77668b75
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
index 1376fb7ff52e..575ba97f84d7 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 580e0af4cd1f..f53054468776 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 148c27c1b9c5..ae2ff0c2f547 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-DIST qutebrowser-1.4.2.tar.gz 3549553 BLAKE2B a3f5c6b8b12ca050618a0a949a29b38c6c02bbb2c754e959f691650f5283861ab7cdb1ae14844b2e8331eaf18f263c5e4c5279441b75393fcd2388890ad456c3 SHA512 bad09a49dc69fdf2188f88d94056f30cc7e0107e02b2acbcdaa64706efdf748e1bd499f28419c6a91438572f005070a379b33f431c38e437975f11aa69f49a31
 DIST qutebrowser-1.5.0.tar.gz 3565920 BLAKE2B e1915e1eefe6ba7ae7b4143fd6c289e6c521f0800cdd866158e8183315ce13f22053f51eada8c3797c3f3338525dd7a44fce75c21eacfe5a4b674382d091b147 SHA512 c77febd1f6dbe2d578f0935c0de0c89556b8c408eb5e6a265a77bf0dac2c2e81659debbd7989806b8e567acf8c42c16bf3ee6bd8115615c0246e6ae5a34f0ef5
-EBUILD qutebrowser-1.4.2.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-1.5.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
+DIST qutebrowser-1.5.1.tar.gz 3566699 BLAKE2B 55a5df744fa0558697ac38d020c40f358c64d9e47e887f77489c125ee359fa93b0af530aa5cb44491b98481869a7341c4b782055eaeace72be2795e763db969b SHA512 6db4ed253c9b69aeed190c4920f85e2fc87dda5403bd2b263cf92ec47569e64b8275677a45c4de4f255fd6f9987d90fc2ccacb7bb10eacad1ca683daa0ce513c
+EBUILD qutebrowser-1.5.0.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
+EBUILD qutebrowser-1.5.1.ebuild 2016 BLAKE2B 08656591e6576d6465bb48ce0e4a51ffe952cd391702c39a2f8868237d817cd3e41b17790226fcff4fb04d86ce5772c7aad2b45d55cdcf7ba20a3c33cd3fdbfd SHA512 3cbbadcf0209765038f4a2fe95a89a76bc44503ce66d6d32322cd8b8bd4792651be06ad8846088de25fb112687a2675ac7334fd82adb7511fa468fae961a71e5
+EBUILD qutebrowser-9999.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.5.0.ebuild b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
index e7535337c44e..2ac3df7f628e 100644
--- a/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
diff --git a/www-client/qutebrowser/qutebrowser-1.4.2.ebuild b/www-client/qutebrowser/qutebrowser-1.5.1.ebuild
index e7535337c44e..dc148cdc4722 100644
--- a/www-client/qutebrowser/qutebrowser-1.4.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.5.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,multimedia,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index cf674525e31a..2ac3df7f628e 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index edd494b07b2e..4169819e5868 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -24,4 +24,4 @@ DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3a
 DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
 EBUILD seamonkey-2.49.9.1_p0.ebuild 12772 BLAKE2B df92edd700ab71f3ac14af6d04bb31dc44d29c41082706f704543e71493605bb25a5e289417d3b2284c8f10ec55cb476ccec382a88d7fae754135f83e78fa96b SHA512 1f78461f5f0af1b3a6901481b2f9a9f2e5b15bb1e91c54c44987be253bcac9b7a0020227c8a7b2671305601de4155a7d4afc07854150d3347ff1764e6fccf557
-MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
+MISC metadata.xml 1824 BLAKE2B 877054e919c97e12d11882714747601b9f455dc73304be2656583fc2875ae68a2178b2afd4d4adbd25c1f13b938c24d6f7d07c4808d85c70c4753dda1dd2677c SHA512 b5a1ea2051d02dc8ccd79d36c7d7b169dbb4fa694d1319596386b93cc9c695cde8aeac15741ff668f6e6ec6e1b77e3140c260f81579a91ca4e581107b51749c6
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index c817c037ff70..b240cff91141 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
 		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag>
-		<flag name="jemalloc">Enable or disable jemalloc</flag>
 		<flag name="roaming">Build roaming extension support (default on)</flag>
 		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag>
 		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag>
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 6344bdcba270..6dd49cd6b095 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.1.1317.4_p2-amd64.deb 58852884 BLAKE2B 887de4a17ef097d87502e65ae6ee89c4f8e51d8225d870a1b352ad6d9d51170ec87b2fa42a0d749b8654789b374d30a7af599dcab26c1314178106b801a2f5cc SHA512 95b3dc1c2f78f2730edc2e30697c8ce49ffa954874c537af24dc0636e42563e81b8d2f0762b4a16a4047f9751d8fe5da0299b024d4b84048f6e2ebd3a2bc9e5c
-DIST vivaldi-snapshot-2.1.1317.4_p2-arm64.deb 51161024 BLAKE2B 60c14b57fee6e39a05b9d7d62a327d961c5ec8cb2239b21f51c5f1fa98752f93f86162cec6176a1342d6588e95d818bcb79b2f331ceb11c4ce422f8925922926 SHA512 311cdec2f8063fb20dbb410cddec7013d251971f73d278be8dc5d9843a7901bcd1bd1f6aadfeb1f4fe7df118a31696328cad821b3b85fcd594b2b1d47b5a1fc9
-DIST vivaldi-snapshot-2.1.1317.4_p2-armhf.deb 51996466 BLAKE2B c2ed497b681ce0523cd0fbe0eedccdce656357b65bf620b27a80a499ead390af68cf0958d21f0d59af393248e7ed3b896684c9e9cf6d0514af273c4b8784525b SHA512 bc4e5be2c4f36f80a4a19e7530a523b95c28b654f898f34d97ebd72d83754101280355f73bca5388d90b858d4aefd2eb0d836fec9541b069ec6ed44f6c3a8503
-DIST vivaldi-snapshot-2.1.1317.4_p2-i386.deb 58080282 BLAKE2B 5da79ebbb45986ab267744ef675c16cc4392742da74610f33f8dc167945b8177531c66664990d53a1ae45d85d82aa3f269bb9c97fc8e18292cf47749c904401b SHA512 c32f14ed23dbc1d174ccea8e9b491de5f2e200a5e2aa5c56ca078b9b4ee03e40f1802113b37343d70a38e716305de6e0588b67cc2a8e12d7526e7456cffd5294
-DIST vivaldi-snapshot-2.1.1322.4_p2-amd64.deb 59786836 BLAKE2B b8bff50bdb60c21274cc4b1789423ca71961539e6ffcaaa25e8085cc98786267d391fc724dbd0153bd11f9c4e1ed1df31d2028d93b9433f6dd76ae415ddc0b9d SHA512 fcb6b4b91cc393f839f77d1cfbffa455779498573bdedf915fd853b8ec37e107f78cfdfc1152053594644b006d336fc70f41386e0d11a83e03f6cb902871addd
-DIST vivaldi-snapshot-2.1.1322.4_p2-arm64.deb 51899344 BLAKE2B ea2583529002760eb79c76110605f2b5600fa244583f6df06a4447b38fb4fc62c4b5fbd4ab9c08c7795a66a48f5c1585b67c540e653ef2adfc2aa8200031f43d SHA512 ee1578fbb3f22dbadafde60b3cc415bd0b2250bcfc61250f57c5c0158ba55a9cdedb44087d6c1995c923d05f765d049d7f77db3d559d6b05e35a3a5e65d02c2c
-DIST vivaldi-snapshot-2.1.1322.4_p2-armhf.deb 52667198 BLAKE2B 5cac3b2da91026ceab5b2cdac5a002ea80fba7dc4b0588443687a04f7bcccf35e83d87de77a50c357acd95a580e50977ca20ced0cad47ce4a02d3dfc8a81b4dd SHA512 75a3fd46eb2a5c3128d8e46eac12cd432da203ff658171725e0f2b833b5fe91bb4caf4f029fb9d4fc1607ab97052135826b7d61bac0d401da1da98a48ce6a579
-DIST vivaldi-snapshot-2.1.1322.4_p2-i386.deb 58598378 BLAKE2B 7f7b205303a8d8eace01c9f94326af2ee6b92cc37c993cc2c18ccbf70e2a27ca16dbdd8f35de400811c86264f1c6374fa7886ef47b4e405edec38e2b05550d85 SHA512 46d14eee44bad24660e9489bcdfc88aa53ee63fb7cf2b81d7f16d23a0c0e26777c0af9059a311444229cf17e1208b2f32bb301c0a07e14434615b600ddacad3c
-EBUILD vivaldi-snapshot-2.1.1317.4_p2.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
-EBUILD vivaldi-snapshot-2.1.1322.4_p2.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
+DIST vivaldi-snapshot-2.1.1332.4_p1-amd64.deb 58107088 BLAKE2B 111424cb9de5aaab2281f390cdd4405a2913bc1fe82cb9ac6e5af971c19ce5b39fa1bfebaa094b6146f7fe8fc22fd6013cbe1cbd001bb527fcc9a1d3076e339f SHA512 90e83702871a2ed9af3a00cde90a192b450defe01cdc0e14c6478cf0897724927055ec7d6855b437788d85fff1d891142a174cc35784bfbb5d6eb97e2f1f3ab0
+DIST vivaldi-snapshot-2.1.1332.4_p1-arm64.deb 50357660 BLAKE2B 47af324087647fa288a265f5e386771895ee78bd905512624255108984190f20396724000ffea3d1917b1df3ebfe5aa996bf9e2f8a22387413aa7a5a2715315a SHA512 06038c1f87a5704ccdd208bf892ca3608d5b096d5d7ffe0f7a56637098c477c73013f49b6584b3567cce00a9eca25e52c88c561e6e65ba930cd046ad94e93727
+DIST vivaldi-snapshot-2.1.1332.4_p1-armhf.deb 51256222 BLAKE2B 65a39ad25415e4937e8698446f7a97bcc7cce2bb425df7ea88dac42715e1575beeef9b570fc987b1b5419b3146c0510a6df0ad5bff9167fe07cd683f53b20808 SHA512 f3c036a73ec3f3a71219b9dab740348467b275c9fc3a0f5c45b44d4e8ee4e7ac9e64084dd7be2283518126e1477688b46a1d6bb3b94e357c689cc74e9b9afa07
+DIST vivaldi-snapshot-2.1.1332.4_p1-i386.deb 56904124 BLAKE2B 10fec817ec87946b07b2b1cc2b15f4008a1f4a58d1798a518709abe3fcaf51d2067d542524a738871916698e557693739c76c835b44f46ce2aae1da8001fe0da SHA512 3279913022fdcd55d60ac0ad3ec4697f5f0b21f6b7c73c0887fc8ec61daf9970214b310654263ba752c2f18951f341a9cc0f39aeb32864b634e3fd794ceab766
+DIST vivaldi-snapshot-2.1.1337.17_p1-amd64.deb 58480706 BLAKE2B d86a87f199cfea16f855e56221ca9baeb75045f02cc39e8384eb1278b96468bc39e53c0d32cb63550c81a47794887997a25ec354bb2f9f1afcabe4c5ca333ca8 SHA512 84e49b82b3b499eed088e8c32b3509a6a0fc594ca6b1dda556b987a95a25daad69d4d5e597feeee49064b7d2c93ba783ae783bcac8992f8111ecb700cf116b43
+DIST vivaldi-snapshot-2.1.1337.17_p1-arm64.deb 50290640 BLAKE2B 7caba0afc906f410da12182a7de595b6eda0e30369e8a3c7755d346a0d6120770566357a2df4a78485551281345ef25d19a6b62395a9f741856ab65ceee6be1b SHA512 6501426fcca421ba156d1db4e4da744ce5cb2e51579d3e182393f3349f0e569f9d08f7c1ad1c8db7ed9b3e2569b71b0045e0a4a31d7533d4ca2df08ffc14cd36
+DIST vivaldi-snapshot-2.1.1337.17_p1-armhf.deb 51215486 BLAKE2B c7ad32d3eb26c2dda805bcbdec0d45b9f458095dae0ec3ed674c017d043490803ebb86abf85059c4a7ef364aaa27bbdcfb1e42138758d207ca5ccb6db3494f31 SHA512 d9f968ebb05e26ecd14b3c5ec82fc628fbbbe314d9ccb2c847a4882db49e48e73865e51f8387595c9f7f7ec51be04612595c7aa5a56d52cab04ce22db7bb13d0
+DIST vivaldi-snapshot-2.1.1337.17_p1-i386.deb 57383112 BLAKE2B a7f12b8b952bbaf12e9499c6c029e98d42096bdfbaca2d9c8c28582a2ece9fb054062d4d259fed5d700047cf7065aa9f4f1f9f5ced1dfebd90fcab56a4784362 SHA512 3ca65c6b68a4d9baf7d1bf5b7413d1a3f191d1fac83d46bed5da0e16d73fc00574200b2977e7c39b0cceecb1f0a6906a977a8e5682f9dd88ec2de97a302c246d
+EBUILD vivaldi-snapshot-2.1.1332.4_p1.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
+EBUILD vivaldi-snapshot-2.1.1337.17_p1.ebuild 2621 BLAKE2B e882d2ad4124d27fd3b7f5ebb7428bbf73d7b9576c303c890e03a510d9218585c006838022eba6164651615aaedd6d9984240fb06f42097e69053c74fbdd5f37 SHA512 8ba29ea3575a298ece9825ae5eaeedadfe4bf7bc47c9495191320293869a524b8bf656a7ca718cfb4eec8bd1735273cb0ed830891728a9f786620401e1fc4721
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1317.4_p2.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1332.4_p1.ebuild
index 91b5d4fe6abf..91b5d4fe6abf 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1317.4_p2.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1332.4_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.17_p1.ebuild
index 91b5d4fe6abf..91b5d4fe6abf 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.17_p1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 1bcdaae7ab34..0340d23e4589 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,13 +1,13 @@
 DIST vivaldi-1.15.1147.64_p1-amd64.deb 52878648 BLAKE2B d08f55f4e2e3a831d4a50a7401eaa7385452f47f28d1194cf8549f27244bf2ea0985d77602149be20b0eba6cecf6acb28d7f3029b19497db7063198f4e09a856 SHA512 f9f2d4073d87a57bfcf28d3d51e78f45a69e4db86c44eb9fb89bd1fcf14561239f90f112f8c07d0004ed740fe2495d10c66f49bb7d99f9c104f28df38d40013b
 DIST vivaldi-1.15.1147.64_p1-armhf.deb 46832630 BLAKE2B 9daa424babfb71dcaba253a98e88a3aba1cbcee9a1aa870070b89ef58a48bd01dc54d3de0e9641b3f1b43f7523ad13a3a873f300304b60b2a8d86b0facdf2125 SHA512 8159afec10f8c6584dc8f28350fe30de155977d1e7b14a269bdd0bf3818a39381fe341e0fadf0d9cc9a683d9c4e2115dc3ae796dca41da4efd4703de572734ec
 DIST vivaldi-1.15.1147.64_p1-i386.deb 52496664 BLAKE2B 3b246203e11c0654bc455ca96194e236c931453f4889fb474a07a0875358642c57425f208ca3a739bdac76d6bb36982c56930bbf290983e666dbc165454dcb8b SHA512 7c5278cb3341bc8932d82005b062324a71fd025e67f3c5d9eaea83ff636a5b7462c33e2cde6efd37e7095df2a229a4dcc8a82b27bccc61905f46a19163134fc2
-DIST vivaldi-2.0.1309.29_p2-amd64.deb 57575078 BLAKE2B c35cadec153f8d00f55ac5e30281f15bbe60ed9051753787453224fc44e98baa63e67613e59e947f80586e6289c518fbcf9890d73102135bd7ed0612345eaa05 SHA512 5c07c13a2c6b5a8220bcd618796f0acdc363ec72af885939ec515e622cff5b5efc0c3b5818e31fcc668d590a1a13576532c8872dcfc95f7e99a57df50e828ef2
-DIST vivaldi-2.0.1309.29_p2-armhf.deb 50850396 BLAKE2B fabc41a1e19b7bde4c824e8ada8759d2268bbf4ea5e9894a4cf17abb5b75ee66ec6717bbb5fcbe7c20e8ae41caf5870a8dc989446f607cf3448e8b20152fe2f2 SHA512 2637911ab51a9150d586be6bc61cd5f82b1f8d98b094b5d92afe3170245b317525936572106192e3265f61c993bd8eba7f0c9fc46ba98d02768f358dfdd62557
-DIST vivaldi-2.0.1309.29_p2-i386.deb 56864360 BLAKE2B 82f243ef0a6976bc52a66875d59ce9f1052dd1bb727fd51d7fa000b22d37c2b573a024b6b90c794825090a153dd91aad408b8387cc2371f866827d049228a05e SHA512 9ef2001b13330695530c1b318107c4db6738b75f08877a53ae1ec1e32fae7749006f770b0a4381df6bfbad500033e73f9d68b855ca563d2cab9c64fcd20cbdc0
-DIST vivaldi-2.0.1309.37_p2-amd64.deb 57597642 BLAKE2B fcfdb5f04ac2821a975d0b7085fb81404fe70035afbd2ce50e2c322070ee1d8f16105eeddbaf416828283535db08f9e3b3ce32b1d3a70e7f1515e685713468c4 SHA512 b616c00be20e3790267c602e07834cc6e7b0ccfaf4aa32ac2d308ef41e3c35ace23c1bd9c5d96da18b37dc2faf4e8618c1c07c1f4c635282cd100dc746dfd3f7
-DIST vivaldi-2.0.1309.37_p2-armhf.deb 50850020 BLAKE2B 55478da8d46061ca36f3386d05c60eb49b4039f9af48f4338d871f15a07e24828cfdf50a10bc6485f8cc1895d308d76896cce454036686f65e288064301b9bd5 SHA512 9327743f1bc535eb36c304fe6e05b1da7db3c424c73a9a47ed6657f9f621ecd433d2c7f6ecd5cb2a68a7058da241b8655dbf90495fada27a09e8c05dda20a3e0
-DIST vivaldi-2.0.1309.37_p2-i386.deb 56890714 BLAKE2B 91170d73f569e7d5b973cffba027ad7ee98b342dde3bf4d51590862505039d551244d9607ac25d79979dc7ab7cbf27b1ef461fc89d2f0828c83e5c0b16ecad23 SHA512 370da0b01522d7b70854f1a73c05035d461088a097a13d6950e1d0b5ed0536c3fd50612c2d939e0ca834c2aed1481942e5baeaa247cdaeb70d6220c9ae3b2478
+DIST vivaldi-2.0.1309.40_p1-amd64.deb 56228348 BLAKE2B 6818250191c3b3a658d543b537e5dbb753a4570e1d56e690c45ff2a3daf519435e8099a2f0a5d5f76dda8a58b5fc2c944549f9b530411ea83fba76f9be44a209 SHA512 f7d52ea615615cb72f16ec2e42fb2a767b2dccfc74f01282a5709858876c0ea804b5299920178683b237b63861939b9f34a5d6aff9057b478498389f05c50a74
+DIST vivaldi-2.0.1309.40_p1-armhf.deb 49870528 BLAKE2B 3474634e3b9a648fb95068e96728ae90b4054c9c8af442e809700776cc2ecfe8583a203ff44162fc7dc3ea424f461b12522b308bd50a20cd3a00f0a9797d697f SHA512 3776560e41900acab5dcd27365cad872b1bfe1fd4d9c3a046b8b45c327bb78ac8f52f271d129d5360601bbb8d8743c3ddcd70fd2e0a8b9b2b146e5f8aa5683bf
+DIST vivaldi-2.0.1309.40_p1-i386.deb 55518798 BLAKE2B bc32914d537cb07d306c54625ad90477c12fba604bd21d678624706d374fabfb3385d756dc8ea1bce2ac1b96432e99469bd03d2b41679b406399642e16fc28e5 SHA512 28cfc62aaf97f4c2774a6c98af0fe3b95c5ad78ddb2c77987f279a81835c0ccbe481fc3800acfe899ce0dfc0344f47c79329050bd06cb70253bd06feb950807e
+DIST vivaldi-2.0.1309.42_p1-amd64.deb 56271120 BLAKE2B 0a1f358692ba0d8db4be6f735bbe567dda018b578eb3013e828876919fdf78db563993691978fb261432c812432ad38a1dd5e61cef43c7ca06e7960d8272a8d8 SHA512 b3cf26a4524626287a38472c4d26cf89560f22d5ea7d272f5be49dbe13f5d83d74bd2eda893eb665eb7886f740bd7d70d23fbd796395a0cc17233ceee874fa28
+DIST vivaldi-2.0.1309.42_p1-armhf.deb 49878626 BLAKE2B 36750726b7f9386214e27194158409b2637546858fb0e53d82645ab933a002eb2231829007b766b65bdb3ef85a95a82f2531080f0c99ee6063922be61aba2c3e SHA512 24885e94ae680618e922f303ef0989fd8a40a697eab7d7504ef3eaa711f3c3c5786076487dd6b64a0299137d96f6db29ddcb8de30b5e478355f54bf2a83c8c97
+DIST vivaldi-2.0.1309.42_p1-i386.deb 55525322 BLAKE2B 15b93162b5880adc2159d026b0638830adcce7fb194d52f15cba77dce24168cdba2ecdff1ac74d384b7e857fa81efd5fe45472e6558e3b76968991f9821ce778 SHA512 eebedd6c275621602b4034d0872b51a54cea28850fe4b2fb959aa9b049f60d325037bb80b78fd447797841fe651a05e2d3c1d209e44153504f9e8175db0eae3b
 EBUILD vivaldi-1.15.1147.64_p1.ebuild 2870 BLAKE2B fc9de8b2fe9abd757136231329e48dd936dc0330e87af8b97ffc40443a8b130d39eba9a025fd01f4903eb851203cf2ff15aab8cb7f93cc2b7be516f57de55243 SHA512 9e0c40988d5713e4403ef273d0d627480da23e26f1ff3f008f3681ba72a3e5244b5de409b4868d3687310a7b36dfb320d7f3bd2501de1b7bc33e152aeb62154e
-EBUILD vivaldi-2.0.1309.29_p2.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
-EBUILD vivaldi-2.0.1309.37_p2.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
+EBUILD vivaldi-2.0.1309.40_p1.ebuild 2914 BLAKE2B c7358066060d6eda51d2138fda438cbb48b0bdc0053f51d6b803b3e35985614cd22613b9bbe941700206006b933d21dd595ef8ef357218a4f6d049e13b7a7741 SHA512 71dc9acb076a7c4780f646301d6eb43b6ca1c9c98805b7d483235c9b13c2f2b35e8b71f7753fbcbeaf05c28fb3844fe9d3593617d3289088c9b4d8833e4dc704
+EBUILD vivaldi-2.0.1309.42_p1.ebuild 2912 BLAKE2B 34c217b5a8ed91836102ed0704d04e584bad47db6865eab825201f2d315b5ee291dd0350b0fa76aee9298705e1517374392dbff67c79353d487509fc356af313 SHA512 9d98a8b01a0078d30b91061bc479064016d318165f00508a5d37a9915ab5e037433d2dade42b3adc1d859b3ee3a6d30c0a8f5e933fdcd8960110bad51718d8e8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/vivaldi-2.0.1309.29_p2.ebuild b/www-client/vivaldi/vivaldi-2.0.1309.40_p1.ebuild
index 5978d2dcb6e5..5978d2dcb6e5 100644
--- a/www-client/vivaldi/vivaldi-2.0.1309.29_p2.ebuild
+++ b/www-client/vivaldi/vivaldi-2.0.1309.40_p1.ebuild
diff --git a/www-client/vivaldi/vivaldi-2.0.1309.37_p2.ebuild b/www-client/vivaldi/vivaldi-2.0.1309.42_p1.ebuild
index 5978d2dcb6e5..548c8b37f6c1 100644
--- a/www-client/vivaldi/vivaldi-2.0.1309.37_p2.ebuild
+++ b/www-client/vivaldi/vivaldi-2.0.1309.42_p1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="