gentoo resync : 04.05.2019

18 files changed, 41 insertions, 284 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 248930cf8210..54eb96d54777 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7b6d025a0ab4..b16af3af2132 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_61.0.3290.0_amd64.deb 67235090 BLAKE2B d278afc5137bf8d986b35afeaeeb81eafc9c003fb89ede35f79386533b6d42808998add223ef792c12550b22078c7c83f9eea78ef1cd4d5c0627a7f50230a41e SHA512 47fce448900edc3cc83568771916ac69274b0e1f759bfaf369a045df9eac7f74dda93d80c6b878d73184e5962edb25c9445ed5cf86d2088285716a97b2d0afa4
 DIST opera-developer_61.0.3296.0_amd64.deb 67217070 BLAKE2B 2937cb8bb782fbb163ce2475971ed0b2dd0d41a74c14c8c6ff223cac1d5f468592b7d8f32b7ea215c87b6699a04c12439127491ec16ba1a94b31d2a863ca5727 SHA512 c49136f6112decf16184883d9198529cbd5717aa978ced8d26524fde09c19b6936b1c538168d417ac4328584913da0503b0265025c9816cab10eea92c4d35672
-EBUILD opera-developer-61.0.3290.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+DIST opera-developer_61.0.3298.3_amd64.deb 68157710 BLAKE2B 94afc24395b5c097c26b5e840a81e5ce2d9f07267680f53214a617569cb51597a140eed1a444db23d8f0067832760c9b41db82f81c18c24e2a2884ddea289299 SHA512 7da0b3d82e340eded7154219b5bbe31aaafaf7ef1b016f76b98e385211f0bf607f7339d2f7350a5196312c67a5ca1287b60ecef2c8e7bd53be5a9ebe2f7a639e
 EBUILD opera-developer-61.0.3296.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-developer-61.0.3298.3.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-61.0.3290.0.ebuild b/www-client/opera-developer/opera-developer-61.0.3298.3.ebuild
index d6081fb28694..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-61.0.3290.0.ebuild
+++ b/www-client/opera-developer/opera-developer-61.0.3298.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CHROMIUM_LANGS="
 	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
 	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+inherit chromium-2 multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -60,14 +60,17 @@ RDEPEND="
 
 QA_PREBUILT="*"
 S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
 
 src_unpack() {
 	unpack_deb ${A}
 }
 
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
 src_prepare() {
-	epatch_user
+	default
 
 	case ${ARCH} in
 		amd64)
@@ -99,18 +102,14 @@ src_install() {
 	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 5c7e0d7855c0..2b2f005b0c05 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,7 @@ 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_60.0.3255.59_amd64.deb 66570178 BLAKE2B 0dcd5890c03a4d919c7ee9df6755f603196626f075b15b94610d68738043f1488bd4d11a06150150c3936a3771edc0f6d12bbb9c4c0e4811bf9c1b4ba12cf2c5 SHA512 d4cad9ea145d603be9541e664e601dd10f4042e894a4362b346bc105c143e2a40d82d6fbb0f3a60b363e435248d85d440674dee3a87eb1a59339d2be7ec97eae
 DIST opera-stable_60.0.3255.70_amd64.deb 66757270 BLAKE2B 53d7089a148837e1a47e8a18d23b7f5c3354a00a43083883e5dbae362edfa7010821c34abb7d2ebd0934f78c04ed284cbff12b9534baa82956b506e228b3197d SHA512 744c42ef7604da8d5ac1b350a8b5ebfd1f2f45fa9ceba3112b3d8623ba720c779955cc76f69d7bcb227e5cf619f2b44916a4a840add2c3fc682e876a4d068bf9
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-60.0.3255.59.ebuild 2302 BLAKE2B 1b7fc128e1c58421587f13b7720fb10788ff8338981b93c4a7cb302cbb45eb45850f9a8e269913c703fdc101beaaac054b58c8a9187323834bc1a4456c8e7921 SHA512 69900db9fa4e439a541c0d0cc7cf7beef2ff5cc3e07ea273342eab5a7d842e9c59163ca93014d705baf8de6b93d55b3e5d42e450979a17b76ee647fcf6faf068
-EBUILD opera-60.0.3255.70.ebuild 2248 BLAKE2B 76738e731a1cc29be4aad25601dbcce538ee9378558f91defd942d37e31abeaea3c3b072dbcba61a8776ccf4dca75803bd229326de3411c960a20d55126b4125 SHA512 cf9c17804e1a27553691d88c16b8e1988f5ff3ad58e8ad4ae064d98295dd31a4762cf3e0f08c4284a49ca626d4378cabbf795a9e65c6fcd638043d8d9e7a5851
+EBUILD opera-60.0.3255.70.ebuild 2247 BLAKE2B 734f9eba1988a021e8d03509e5fcd235de1895afc79d5e27cdaa7eb106f86b9b0e278885598a16a3ab63c25faded81d5285771ec4c96bb221f34f543c3617dca SHA512 644ce5f2adf8d47b8bbf04287f3a085ceb701730d97f74de95e630f976004812ab18f245c6f84d72350e8ed102f3b18b25f04066ad5dfa6a94654d742fbfdc93
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-60.0.3255.59.ebuild b/www-client/opera/opera-60.0.3255.59.ebuild
deleted file mode 100644
index 3e9910b03ccd..000000000000
--- a/www-client/opera/opera-60.0.3255.59.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 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 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/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-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
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || 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/opera-60.0.3255.70.ebuild b/www-client/opera/opera-60.0.3255.70.ebuild
index 72f8b6bbb496..a7067728cb05 100644
--- a/www-client/opera/opera-60.0.3255.70.ebuild
+++ b/www-client/opera/opera-60.0.3255.70.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index d957dec9cf67..d5a3743fc072 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,6 +1,6 @@
 DIST otter-0.9.99.3.tar.gz 4861110 BLAKE2B c5672bfbd5bdd39bf294516c4ec3dc9e14a469b999434423c1e938dea6eec2c611a8ae7fdb004f93f122bed14c1c7d64203b73e68f55cd59cea48c2901fd3288 SHA512 35a8f24e6c9daf8cdc7aac8467ac4e3e32ea8447df2ded4effe0f514da2d248fa783e5edec8db910c8374905dc7171c45f4ef2a5f1d1f8b430c459cf15fba6e2
 DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
-EBUILD otter-0.9.99.3.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
-EBUILD otter-1.0.01.ebuild 1815 BLAKE2B 2ddeaed25873c1521d00206273c9f997b2b06fec16cbc6bbe689ed6a54394eb71ba124e9f5e4b21326c403832ce0372b2e193709f06b95f2b07f0800afbff80c SHA512 b3e1d5998bedbbcbc55a9f65d24f00ad7d397945bc9c4d76435e19326dbc9cb0683ff65a137515042f6f42b2a1fd90bb1e7b8352fcf323e4568b763ee44dadac
-EBUILD otter-9999.ebuild 1454 BLAKE2B 44a2b89a5ab1b01a9d16440d25b4de7889e02fac35a5c4e5bb755a3323b8c68baaa27d8518905246bcb6741cec19e81713130dd3b516f23500bf6c3d6dc8e2d5 SHA512 ae93d8bae4b15c1cb99d304d28ce9547bd068bbcc29924091523af470293bce0f077a06042785a76b66a89a431f297af52c5b35eba987de2e7ac769066b983b4
+EBUILD otter-0.9.99.3.ebuild 1815 BLAKE2B 76b363fc2f95718c9a0bf4b7c90313d438ad564ef13cb9b3e60594b3621cac5e5ffcfd839c3a5195ff8f63a0cae82a1039df1335f18737734271554383270ffc SHA512 7df9d8457b92ff835e22cf78179d5da43f25eaec5ad95922c0e638abab16ac963cbf8dd4fb72c88cf51169d4d83cfc82c9e2193b22f077fab862d6f700039b16
+EBUILD otter-1.0.01.ebuild 1816 BLAKE2B e01310af35e9bc1d2d8f099af71e62d5b64f1f0d3e499358d8a86ef2f60b4e9e7cfc970fb7bf0d636ded44ffedd6f5124fb05fb14a7af6b54cefba13d569d654 SHA512 e2fea7e2f3a1226db1369b9f0b58cadc2bfb16bb4bcf1676c69fbc256a2c31b8838bdfcac7d9e076620130ba31d2794ed1603a8f39bc7d990c2b493400858185
+EBUILD otter-9999.ebuild 1434 BLAKE2B f58eaa95c7f6705fb5b00278569f1fe5242643f2c82e2efa22d1383f68fbb2de1387c9970ded8f195afe77417f4828be235e959d5a82f82fb5dc8ff9274146dc SHA512 632cc90d091fdebc593ad30d0e3250133d1077200543a8e87607640894e7aa5ff408585805f52ce8734a465293fcbdb446760fa22dd6dabe3f88bc110acafb71
 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22
diff --git a/www-client/otter/otter-0.9.99.3.ebuild b/www-client/otter/otter-0.9.99.3.ebuild
index a354d54d965f..1262034bd2cb 100644
--- a/www-client/otter/otter-0.9.99.3.ebuild
+++ b/www-client/otter/otter-0.9.99.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/www-client/otter/otter-1.0.01.ebuild b/www-client/otter/otter-1.0.01.ebuild
index 6b95bdb7e7ad..a2f202cc6df7 100644
--- a/www-client/otter/otter-1.0.01.ebuild
+++ b/www-client/otter/otter-1.0.01.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit cmake-utils desktop gnome2-utils xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild
index 4cd684266975..dd20d3231ae6 100644
--- a/www-client/otter/otter-9999.ebuild
+++ b/www-client/otter/otter-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils cmake-utils git-r3 gnome2-utils xdg-utils
+EAPI=7
+inherit cmake-utils desktop git-r3 xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 EGIT_REPO_URI="https://github.com/OtterBrowser/otter-browser"
 
 LICENSE="GPL-3"
@@ -61,11 +61,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 31ca134238b4..ede6dd6c95df 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -2,5 +2,5 @@ AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a
 AUX surf-9999-gentoo.patch 1116 BLAKE2B e7d129d1e1a9faea353cf0aac58a3f1d149dc6afd550dfb2031acf1aa35c1b47066953f3dbbf3d964b2eefdd450818a827e7d34d9f6fa57f5f145aaeb8b89de7 SHA512 9e3a2df6f7765c9db8c3a67904792cace82eae9a3255e389eb3cadd164fe3c6b21fddb55984b00a3559f787820b59e17dd4d0b17f29f21aa153fb1d1027ae317
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1241 BLAKE2B 6fdc7ed699a0049912a7e926792b9d419afe0ce9be3e07f6a6880742c1c5d97f563b02cccdd156f1119e6ad6ba6b610ef018b44cf4c85f9e8af6fa924f1b3d8a SHA512 750abaefc4b75e6e363f5d4a7b9ae48ed2e7e24d6ba9d1c8a79c8c6d6ae82f4e98339b191d04bd42d9c9a5abed7a2875b5f5eda12a2bcddd5039e77da809c1b9
+EBUILD surf-9999.ebuild 1241 BLAKE2B 438aad0c8a8529f4042235f8490a7b980e922b3500afbc83e2d95d144bef9a46a786abe98d09c65a6a3f056458e78f96593933a25b10c5d3bff97b9587bba9f7 SHA512 c06d268dd882efd15ea7128a4e4966f0b1ffbd9c8da3ce180f1976a469d89566bc3a7dbcdb39dcb5769b4b9feefde46358cd79a99b58f79ccef4fdaeaf28ccc5
 MISC metadata.xml 391 BLAKE2B 6717a4467323f201068033f9435a5dcba159ac8fa49f47495891de79b82193a3c1199ac6cb5c8ffcf5d28cee1d484cb0f53bee79d0a4649e6b283c1f5896c634 SHA512 cbfbe5cdabbe5c9a41b6a190fc675518fbbc682d47b2dce2c832e0afa8fbab0c5d0cce48d3666252d352ca2fd47788b928d69ca616a5258b4abf7873bf4c53f0
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index d145e1256629..8670c83e868f 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 49bd560476f0..bbc2dc3ef2ad 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.5.1511.4_p1-amd64.deb 61303092 BLAKE2B a6d1edfa193a90c55e997d7e11ac8d94ea8f817a1837d35524032b859d5b4ac422f33ea072e3d7206809508bddc477978219d3b7cb880f06564e04bcc77bf4a2 SHA512 b430c44272d9f7a7a8e60559e24181de5745c54a9647eb2312780efe393bb39b8d19248fb45eda39449944eddc60ef45e4ace0bdd3465aafcba0d5e7e4399b2e
-DIST vivaldi-snapshot-2.5.1511.4_p1-arm64.deb 54686512 BLAKE2B fee93655ce1dff7d5c85cdaf3cd86f3204f5ce6db3cfbd86f0cffa9ff9821cc88cfb9c344391c804b9b2fe08e9a724865277e028ccda76e0e65ff849a5104aa2 SHA512 af118c9e053be1a0b300abe1f053f3ecbf2123c6da126014cc38d69b64574de6134ae5375124b79bdf6f63a8089c8fb917085e567c555d105c0dc201323e7ea3
-DIST vivaldi-snapshot-2.5.1511.4_p1-armhf.deb 53827152 BLAKE2B d6261e387e60728f2c88768fda9786a663500a415cf077acf903dc70287bc2314d387eccdb0895a79ecdfc1d2f76622b6ffb4f6d1efc0323a7efced3d8e04a76 SHA512 6d16985c17fb1f15da4eb7e15c596f71fffc5baa3a313f982e07f44f643588a25d73edd121a999467d9aac3023a53ebe75e35d3f371883057ef736ee5774e750
-DIST vivaldi-snapshot-2.5.1511.4_p1-i386.deb 59161192 BLAKE2B 57891948756d8cc2249ff4582edac3368aa4f56a4c408a9a2200b39541216415d3326ee2342bbc20794914b507ea83d04a26778be36127568d2c0d6e0ae864e4 SHA512 f68426ba6f3938de8d28b401b2bf6312ea63f3d56e0163c97c671fe9def84c983c3e6c3a81cd02d174e98353aefbf2241e828faad5c4d8a6b1f51dd8332e3f85
-DIST vivaldi-snapshot-2.5.1525.4_p1-amd64.deb 60880012 BLAKE2B 5d99ea36931a2558ca5a3bb9b325d819e54c1f77e269772f0fa030fb4df1ea517c16e7d9c4388402f59570a8a41ad5a5a036d59046f7f0010522ef2bd29519db SHA512 403670efb317a477a0220cec9d23e8c6c171ce8e203c23f562253a556f778a97295b4a1174c53ae3ab8ef25e82e9b1e549880b220f155bdd35d6207fcba4184d
-DIST vivaldi-snapshot-2.5.1525.4_p1-arm64.deb 54946944 BLAKE2B 9af3e6c59cd04cc68a02e94c9292c129edd2647abd07e8365af4b4367803188c7b212dfcd9a787c1188915e67614bde87d52b6f868df6b130019e5668f36feb8 SHA512 820c37189f89c6100b1b8e44611eda32c567e6f401ccb79dee4e10752df8a0999ce1606302f4701502055ce8f7926e82508f4c03b6063744d7d8e7dfd751b6f2
-DIST vivaldi-snapshot-2.5.1525.4_p1-armhf.deb 54084044 BLAKE2B 69bb8fa89431b51fea31aeb421e50c774500738cf429413f8f49c4ab33e3539fd5a3e5e0ed80adf473a9be4651b663d95f9ede702e977c63126545e93fb04b08 SHA512 96b8de594e0c9f9223a8f3fbebd221bfa7247c09522faa24a3ebafdda761be4f4c08a29ba501ca812def38438b9384da209be2fcaa28fab967d94dfca06d5a5f
-DIST vivaldi-snapshot-2.5.1525.4_p1-i386.deb 59720784 BLAKE2B 3ca458bd15a3dac83df3d423065152736b41d8a881dc2fdb2c8107b3ff540c895f244abc9f96cc86457deee25b02e88ea1f14fd9c26aec4cf1abdda05c8f97eb SHA512 14ca6c7a0a6442b8a96c034dee553b713941ce2f07a2548b47b464cc83a9c82de8e30bba6638bce65c6a87bdb5374bc424b1d5bc7ef62bc1bc4b87ed7bc186a6
-EBUILD vivaldi-snapshot-2.5.1511.4_p1.ebuild 2608 BLAKE2B cb6968ea1d431b42b400229e2af186fad5e04fad9826837d3d93dd515b4e24e38fb6a7ea924a5e562f85a24308db2beca0eb571ee4cd97222a25a1f2f47db4a7 SHA512 f21083acc0529dce17886fe22d09c0519ec60c382b2208b8e42fce8e07347dc4d94f5c3036b681e5024c61b24e29a9b2a48173fdc9673192a44b2a31e318a76d
-EBUILD vivaldi-snapshot-2.5.1525.4_p1.ebuild 2608 BLAKE2B cb6968ea1d431b42b400229e2af186fad5e04fad9826837d3d93dd515b4e24e38fb6a7ea924a5e562f85a24308db2beca0eb571ee4cd97222a25a1f2f47db4a7 SHA512 f21083acc0529dce17886fe22d09c0519ec60c382b2208b8e42fce8e07347dc4d94f5c3036b681e5024c61b24e29a9b2a48173fdc9673192a44b2a31e318a76d
+DIST vivaldi-snapshot-2.5.1525.30_p1-amd64.deb 60899748 BLAKE2B e88c9cdd4bebbecf826c6ae80f9f4aa440063d16cc3fd0b6adab892961178f163fe4e1dab940ef35e4519b77e42a12c3ef00f6e91cc645c8a0eb2cda55c11aca SHA512 a52bd100c71debac39e5cf98a93be0ac3ce59d60fcbc33d6374493af14a16acca4b3729c6403bfb6d3d4c43a27de59a3d5962a70594504e6fb22b352696b21ad
+DIST vivaldi-snapshot-2.5.1525.30_p1-arm64.deb 54961128 BLAKE2B 3709d785837cc3e3dae04f00cbb0828f46ce241579c0ccc6c0249e197690b8f731879675ddaa3a11af81aa46e9381e138734f51cc0e5ae1bc8430e1f020a87b6 SHA512 9723dfa4e64505422acf3b8c48db3bee2e5d935f96f92e3f592160c270f3860a24085bcd8c874145477f8bb960ee21fa216655fd932a2797621866a275c4732c
+DIST vivaldi-snapshot-2.5.1525.30_p1-armhf.deb 54077984 BLAKE2B 3a73be14c2e14258e87455283ac446c8ee3fb92328fceca232f5265510eddf2c917fd9f2b06b3aaafabb701a184a4b086ab648c27c4f728ee83a94dcf1178e3d SHA512 e72d37cc330b36c8adb8697cad7cbf4f1efdfff788f03f372db26708b0fc505d5a3405c0b16e12567a6af7e4fb1b7ca77e9f68c2f96d29d13a892b006f57c869
+DIST vivaldi-snapshot-2.5.1525.30_p1-i386.deb 59714368 BLAKE2B 71568d1e0a682e6f0eac8bac479d0545029dbc1df58d7ece41f5c8677ef9adc46ce43121e62f934d3dc483747435c93d7adfe6fa52a30aca00d8d94b7f9a1d03 SHA512 a1e540b0a383996f544af65c9ad38d93a702810a3ca6fb1cdb74ad3771d312d64f75b75ea913c17a9f43ef4f65c40132698c9f4560aa1153daf4a38edff07377
+DIST vivaldi-snapshot-2.5.1525.34_p1-amd64.deb 60892880 BLAKE2B d28cdaec003228f1cae200ee17a2b5842fde8051e439ef407e3acbfd09acf9189a08d4db83ce7218c11d13ad085b7773fa099d8f2fb308f825e04f70360cbe86 SHA512 d1dcf36754927161c5994a739a1862e77611fecaf1469fa3d7e4203295543e42aa1b1d0c4adffad4e26589f5532264de3c6e2b2819c19dfddafcd3cc5d2eff3f
+DIST vivaldi-snapshot-2.5.1525.34_p1-arm64.deb 54963764 BLAKE2B 90db5403e9f48ac5ac0762b1c03797a46bec0e38278b49d30c5f00abdab2be0543b260823366adbc3d70283187e0b9d7cf37cb7d7fd557aef34770add4fa5ded SHA512 42bd2435cf0162dad2256df85e7fe3782e675f66934a34658db8994c627d857f037d70f210198695868571b5e56159ff516cdaca257fc2f55172393ab06e4646
+DIST vivaldi-snapshot-2.5.1525.34_p1-armhf.deb 54102516 BLAKE2B d4d3b8d8989805e69882bb1e682943996108d3e6a7d5d6fc6dd6067ee5d42a4e91259e11f0221a36e8b5d6034b360bf723a4ccee55ad8de2ef8008fa647f2179 SHA512 0e37251f010acd374b2e51dd5ddc44c6791ab18e8bc90e924002ebd18ecb0c075b241e99d357b9fe33f5a57caff9ac2fa79a431c1133e32faa3a00bbf15f8b4d
+DIST vivaldi-snapshot-2.5.1525.34_p1-i386.deb 59719540 BLAKE2B ae683a1e77c53807b804957501e05b46b12af21870c0d0edf0285c0222757f10f6f79286cc710b0a269faae60f728b111d5d6a302828f6472d24ba747efa7fd5 SHA512 3b79882cf035f3a583357d6b646830f001e047beb4626ba2ded4d93f5617b2beb5a4160defab1cca1a8c9311573f0582a460c868cdc122ffe08fec553e1c6e6f
+EBUILD vivaldi-snapshot-2.5.1525.30_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+EBUILD vivaldi-snapshot-2.5.1525.34_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1511.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.30_p1.ebuild
index 61f30aa09661..76ff637ebaa0 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1511.4_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.30_p1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 CHROMIUM_LANGS="
 	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
 	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.34_p1.ebuild
index 61f30aa09661..76ff637ebaa0 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.4_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1525.34_p1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 CHROMIUM_LANGS="
 	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
 	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9a0c831d7ff3..36637038f488 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-2.4.1488.36_p1-amd64.deb 59073076 BLAKE2B 07b448bbea31fdf74f13d07258a28c52560209b8c1d47005cef5985fb50d22680706ce5cffa833042efc73d900acde1a7911d8bc760bdf7972fbfe4e2d8f4700 SHA512 07f1509739ec96de825373f61f058731613a55a1432b5ac3698b2e02eff86a587d32208e477f7df4272065c6c934c0e9e05c653440427142d345ade0cf30e397
-DIST vivaldi-2.4.1488.36_p1-armhf.deb 52193248 BLAKE2B 17a84aa2208ef7bb5ab686f0101938377626ff63ba8455507ab145a615c91eba6827299e425f9554a3e814a27068154d9ce65e73adc4a0f0d636c457d0d2c9fc SHA512 bfd4437f954503bb7e757a328c8070e783357dc0db70a5caa675cfc167883a19b0caff22ada88555a432605078360ba6be9070df9cee97e1ee88bb8f2ce55bc8
-DIST vivaldi-2.4.1488.36_p1-i386.deb 57287212 BLAKE2B 0d70ed125a29fb42e302c930615f5ef1b39443cc174da5f23896ab8f8d81e01b3d9035f00897e536f1f18199e022cff113279f0cf269bf0774b6caee96cf6a9f SHA512 6a6e3b4eec2e524eb3942d9b6c844b691704d26aa8123fe39e05e9ad4bcfabc340001325f3ed2e065de67b5e1384c67043e2d55e77e101ffa9c4544e0b4d6543
 DIST vivaldi-2.4.1488.38_p1-amd64.deb 59085524 BLAKE2B 1f64a54b011780dddf785d1d24273238621d9c6d72f7987d2a4c3a079cfb1756239c16447ab13167e7d55feaf61b384c2f4226600e001ce812034646304ecee8 SHA512 10e88503537211fc28bba20759882113ee23de732487b38fcbf54fa36ce5af0dfac25875b62c54a144077d76b672f7f3111c4f9a87e39d4fd2602323379bdb44
 DIST vivaldi-2.4.1488.38_p1-armhf.deb 52185308 BLAKE2B 8809ad8f86798d0e1af89342c4d9d00137d6238ee1515615695fa56d9f37e9d5f45bc8cb59cf52afdc18c8fe2079f989efb29345a9d54b0e9381998c2b2ae6e1 SHA512 0f856090774667861aa5a088f005e92507e2f4bb7b8952d7f91a4a061406964c11963437f5744d063902efd001c225d88047b409b87182bfaa47030c307cb373
 DIST vivaldi-2.4.1488.38_p1-i386.deb 57296220 BLAKE2B 7dbbd877114aedee0f762ccec709389b7ef447deaa34edc972a2a644d25e3ff58c64d804d0f7c503a261ec2f49e669bc38c85ff7f6211b7c637e13f759303465 SHA512 7abc97c924e60fe1eac24360b73ade74f1d0a518abcd569b42636c3ac54960b8c4b9b4e9972a3ba364dc5d5fe07e3de658956717a644e7c3d192a37865ce81a3
-EBUILD vivaldi-2.4.1488.36_p1.ebuild 2900 BLAKE2B d87d7b496037d5ad5cc151e7c41b5bc17bee148c05aee22a2f7b8ee600e5b7376cdd75b5f1d8e505435f467049879791b30c4314c63aeabeb342047c67bdbeb4 SHA512 a8e10d71c44a665bc305e094ee90510767317b925467b6e3327d2b2f83cfc6892539ceef4b492f480c0adfbcdb949cfc2ba050b8db54e43fa41a53e67fcb35b6
-EBUILD vivaldi-2.4.1488.38_p1.ebuild 2902 BLAKE2B 90b228d646569c8563b30d05882a352239cae8df9b690885decf5a86de4291bf528ed924678752d6bc015fa2b1d53c952a95328cdf07260fbaec52c31b5a0f08 SHA512 9d0a3abc68ea7eea61f25289b6b9f2cabef9a6f7e555865c837819685022b3d853541a244f4c0d371d865ae6bdd19ac46a645be8625024b4e6cef4a1c3555e52
+EBUILD vivaldi-2.4.1488.38_p1.ebuild 2900 BLAKE2B d87d7b496037d5ad5cc151e7c41b5bc17bee148c05aee22a2f7b8ee600e5b7376cdd75b5f1d8e505435f467049879791b30c4314c63aeabeb342047c67bdbeb4 SHA512 a8e10d71c44a665bc305e094ee90510767317b925467b6e3327d2b2f83cfc6892539ceef4b492f480c0adfbcdb949cfc2ba050b8db54e43fa41a53e67fcb35b6
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild b/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
deleted file mode 100644
index 98b6bc1fc327..000000000000
--- a/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	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/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild b/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
index 102ad7b192fd..98b6bc1fc327 100644
--- a/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.4.1488.38_p1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="