gentoo resync : 08.06.2019

18 files changed, 24 insertions, 495 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1a8c3e59a239..dd0dc3b2b1f3 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 98885bd32f84..ee5cbb7411c6 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_60.0.3255.103_amd64.deb 67440172 BLAKE2B 8c3304ae40cdb289297e836dacc16aafa49bfb47287da7dfaebf5e967a0905a478bc060ba5be6b2709c30f530724b73e10986d15b838c3c0bb4b0958cd3c6d72 SHA512 b42bb9988a194aa50e359228031b38f4a00aefbb30d3b90edf6f3253a891a4b01d1ab8b99152fe2bfc3e91ebc1f9d4a433c62ed55d80d528e30cdf6272324ddb
-DIST opera-beta_60.0.3255.79_amd64.deb 68344076 BLAKE2B f8617cd2840d2682c8ea8bdbf20c2cd2d579f17d62e9e005cc864d666317787b205cdb5f741398b9476dfd7ca078caac8f38feedd7ca4e00274396ebea86aa89 SHA512 e7de5f9cefa7c04afc34aef6f377cd90ccf87b6362e4ac94125245a845c3e9bf6d7d9d7a99dcd4187de7aa576fa6929c110de9a774fcea5da6dde13f488908dd
-EBUILD opera-beta-60.0.3255.103.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
-EBUILD opera-beta-60.0.3255.79.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+DIST opera-beta_62.0.3331.5_amd64.deb 66671778 BLAKE2B 7fde67b73c0af74aeeab4318ea326369c24a0d9ec72b755ff978d7d952b7c24b5bb1a119746282adfde1aba456c48ae8785a0c6e7b8a4f46fa37effdad1d27d9 SHA512 4c78b25910602b05ce4aa2b3bab5d962fc583a38fa409dfa231320f1be9fe5abd4c4d0265a5c3686f4888f5808b12a5ff09b7a2381e6a786db24caa32e15844c
+EBUILD opera-beta-62.0.3331.5.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild b/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
deleted file mode 100644
index d6081fb28694..000000000000
--- a/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
+++ /dev/null
@@ -1,116 +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 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-beta/opera-beta-60.0.3255.79.ebuild b/www-client/opera-beta/opera-beta-60.0.3255.79.ebuild
deleted file mode 100644
index d6081fb28694..000000000000
--- a/www-client/opera-beta/opera-beta-60.0.3255.79.ebuild
+++ /dev/null
@@ -1,116 +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 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-developer/opera-developer-62.0.3331.2.ebuild b/www-client/opera-beta/opera-beta-62.0.3331.5.ebuild
index 132f88d22363..59a8587ec4bd 100644
--- a/www-client/opera-developer/opera-developer-62.0.3331.2.ebuild
+++ b/www-client/opera-beta/opera-beta-62.0.3331.5.ebuild
@@ -61,14 +61,14 @@ RDEPEND="
 QA_PREBUILT="*"
 S=${WORKDIR}
 
-src_unpack() {
-	unpack_deb ${A}
-}
-
 pkg_setup() {
 	OPERA_HOME="usr/$(get_libdir)/${PN}"
 }
 
+src_unpack() {
+	unpack_deb ${A}
+}
+
 src_prepare() {
 	default
 
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 41d2b564ea04..bb24f0fac42b 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,3 @@
-DIST opera-developer_62.0.3323.0_amd64.deb 66692130 BLAKE2B 72a00ef3eb167a257aedf8e0cdd7928f6306e57d81507a1ff864608d863370e172264b2ac54d68a6d86f1cf900179d10a2f8fb40446388585e5240d58041ddb0 SHA512 a9bc7d93117853c82a85839504da0a1ab59950a745e2193477885144cee460b98501b88576eecd7360ad17c6e10282345230c31ef2a5c203e53b2c5cef65ee06
-DIST opera-developer_62.0.3331.2_amd64.deb 65860794 BLAKE2B 2ea22afe0057f3c15cb54d6aab858f3b2beb63fb127d3b46ab2dfa6cb1b83710ab8f8a4503bf06996a12e51dce2f5997ae996e76026f767f67df3d80e67aa5f6 SHA512 1e652fbc35b72b5f655bb8d235c49c721a958a43db04124c2285bbc5499d0e301453be2b071a85cdc98f672fc0ada0e3e5513ac96c726453cb2afb925d442a12
-EBUILD opera-developer-62.0.3323.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
-EBUILD opera-developer-62.0.3331.2.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+DIST opera-developer_63.0.3340.0_amd64.deb 63572406 BLAKE2B e3c562f25a27f4583289b6fe08ff0355c862b9652b49a5b2a3edc0a97bed485410266e5735540c1b0c854e1120227a900f0b159d748a26585739229b77398a6e SHA512 a3a969eb3eb13e62f0e44fa4fbd92ef42cf91231ab956a4a09b31a1fca529f3e3d3308a6b6fb4a63dd5ba90b74efc69958c0ad7ecb64148c8a1ce5606c1c7921
+EBUILD opera-developer-63.0.3340.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-62.0.3323.0.ebuild b/www-client/opera-developer/opera-developer-63.0.3340.0.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-62.0.3323.0.ebuild
+++ b/www-client/opera-developer/opera-developer-63.0.3340.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 9098be579407..7a0369989183 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -3,10 +3,8 @@ DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11f
 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.109_amd64.deb 66648238 BLAKE2B 7c35f4c5b93cccffe1a923b36570858a74c4c5045c42da505bc8fdd0646ab805d016bbdce6ab8202620a91ff3ce450e4cb89a6f643211969652d63c76b4f7d37 SHA512 80a0ed6dad6ee3be374d0f73412e3a1eb55912a95951cd5a0d7cd9f442ccee0d30d812e09944fe4a68bb73b068035c62478eb478c332427f5b013aefb96ba8e0
-DIST opera-stable_60.0.3255.83_amd64.deb 67302926 BLAKE2B ad45e40588c3b93f44f769b9db38693407c2dbfc1a61d1e284cd6cf93f93afcde6e12400f47a9b44f928cfc338b670e6e7d958bb39d33468f8d6c70dee94e58a SHA512 037ed829bef7561bec3ced495ca7b975a81ddd8fda87f93988b1f7c220e9fb1ea1f5e425a8e72aa6da0881df94a4b520bddf38a4ef6ae49bed6acb572c949219
-DIST opera-stable_60.0.3255.95_amd64.deb 67318050 BLAKE2B 7c35872268acb6380755f07b6a33a236d5bb920fe04e44a9ab686610e44da0dbf1246e8b36094ad3d3c16a1c9acecbeaa0c772277809530231ed0b048eca98ed SHA512 c58bc42527b5dd876f06c9d7393f03be2b5dc598d7e66159f24bdceef1ea4f6d3832ee48b5a793e39c44ad738d84e22e0083531f5dfcbc9ed1dd169fd9c06d9e
+DIST opera-stable_60.0.3255.151_amd64.deb 66905482 BLAKE2B c3574e83041f6c0f05c16d4fc4707ec4595aebf221167306e33c016fb24dbd47e94c92a894beacefeb801ec7444ee66fc53eea125c6b940a73e6488c6947cfd8 SHA512 ad594a5ad6302e5adaab409955a543fa8790eed2ec2e49b4aea1a2049fc941f4f5205998a26a4be03a89b1bdbbeab23c5f57b585bb23644d83edc26509224f71
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-60.0.3255.109.ebuild 2284 BLAKE2B b3e4b5f48d96003d2f724d35b2c0d998baf843543037b34c40d58e0ce5513d234bdf2daf9b3b9279b3668b9464ecd8517f83a94fc928fb25cc2ce40a1240a153 SHA512 065e87281f1ad7b4c0b3701a21e0e4db5f074ebd16f326a08c0c8f48b4b79d09b1d8261b5ad3ada94e8277cb304d6459279813eb0232b5b41f36ac64ca680aab
-EBUILD opera-60.0.3255.83-r1.ebuild 2283 BLAKE2B 8b99aa39e7bc0b4c206f3ac54ddc5d6495a62a2eac6ef33cd92a09fd91149d55ca5a8615d8300fe4288e92fb4afce1687ae1f1e7d571613ccacc879552bbfa6f SHA512 af90586375d9560be2b636707e531120fa5f7c29309431961b542a09d743ea91718f5a7e6276b7e26301efcdfe2f8925189620b2f4959e6f23fb2583c5555d78
-EBUILD opera-60.0.3255.95.ebuild 2284 BLAKE2B b3e4b5f48d96003d2f724d35b2c0d998baf843543037b34c40d58e0ce5513d234bdf2daf9b3b9279b3668b9464ecd8517f83a94fc928fb25cc2ce40a1240a153 SHA512 065e87281f1ad7b4c0b3701a21e0e4db5f074ebd16f326a08c0c8f48b4b79d09b1d8261b5ad3ada94e8277cb304d6459279813eb0232b5b41f36ac64ca680aab
+EBUILD opera-60.0.3255.109.ebuild 2283 BLAKE2B 8b99aa39e7bc0b4c206f3ac54ddc5d6495a62a2eac6ef33cd92a09fd91149d55ca5a8615d8300fe4288e92fb4afce1687ae1f1e7d571613ccacc879552bbfa6f SHA512 af90586375d9560be2b636707e531120fa5f7c29309431961b542a09d743ea91718f5a7e6276b7e26301efcdfe2f8925189620b2f4959e6f23fb2583c5555d78
+EBUILD opera-60.0.3255.151.ebuild 2284 BLAKE2B b3e4b5f48d96003d2f724d35b2c0d998baf843543037b34c40d58e0ce5513d234bdf2daf9b3b9279b3668b9464ecd8517f83a94fc928fb25cc2ce40a1240a153 SHA512 065e87281f1ad7b4c0b3701a21e0e4db5f074ebd16f326a08c0c8f48b4b79d09b1d8261b5ad3ada94e8277cb304d6459279813eb0232b5b41f36ac64ca680aab
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-60.0.3255.109.ebuild b/www-client/opera/opera-60.0.3255.109.ebuild
index fbf25ee7c636..2144791d1fbe 100644
--- a/www-client/opera/opera-60.0.3255.109.ebuild
+++ b/www-client/opera/opera-60.0.3255.109.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/opera/opera-60.0.3255.95.ebuild b/www-client/opera/opera-60.0.3255.151.ebuild
index fbf25ee7c636..fbf25ee7c636 100644
--- a/www-client/opera/opera-60.0.3255.95.ebuild
+++ b/www-client/opera/opera-60.0.3255.151.ebuild
diff --git a/www-client/opera/opera-60.0.3255.83-r1.ebuild b/www-client/opera/opera-60.0.3255.83-r1.ebuild
deleted file mode 100644
index 2144791d1fbe..000000000000
--- a/www-client/opera/opera-60.0.3255.83-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker 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}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	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() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index d5a3743fc072..5989accbd4e3 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 1815 BLAKE2B 76b363fc2f95718c9a0bf4b7c90313d438ad564ef13cb9b3e60594b3621cac5e5ffcfd839c3a5195ff8f63a0cae82a1039df1335f18737734271554383270ffc SHA512 7df9d8457b92ff835e22cf78179d5da43f25eaec5ad95922c0e638abab16ac963cbf8dd4fb72c88cf51169d4d83cfc82c9e2193b22f077fab862d6f700039b16
-EBUILD otter-1.0.01.ebuild 1816 BLAKE2B e01310af35e9bc1d2d8f099af71e62d5b64f1f0d3e499358d8a86ef2f60b4e9e7cfc970fb7bf0d636ded44ffedd6f5124fb05fb14a7af6b54cefba13d569d654 SHA512 e2fea7e2f3a1226db1369b9f0b58cadc2bfb16bb4bcf1676c69fbc256a2c31b8838bdfcac7d9e076620130ba31d2794ed1603a8f39bc7d990c2b493400858185
+EBUILD otter-1.0.01.ebuild 1796 BLAKE2B e8b3717ef5019739ff4d02b44873e63fe9a029357e195d3c564d10951d368aadc6aaf1a7d2b5123a0310ce3e4589d1e0649b2c298e530ca29f83e3430c468bc7 SHA512 e954204e02f322ffae48c79df169aea0d50928efeb6aaeaef43d24a2fea8d720a5577cd919f65f35b45cd5b2ec937822070b12ce198064df69f9ba91b2e836a0
 EBUILD otter-9999.ebuild 1434 BLAKE2B f58eaa95c7f6705fb5b00278569f1fe5242643f2c82e2efa22d1383f68fbb2de1387c9970ded8f195afe77417f4828be235e959d5a82f82fb5dc8ff9274146dc SHA512 632cc90d091fdebc593ad30d0e3250133d1077200543a8e87607640894e7aa5ff408585805f52ce8734a465293fcbdb446760fa22dd6dabe3f88bc110acafb71
 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22
diff --git a/www-client/otter/otter-1.0.01.ebuild b/www-client/otter/otter-1.0.01.ebuild
index a2f202cc6df7..4437dc69c96e 100644
--- a/www-client/otter/otter-1.0.01.ebuild
+++ b/www-client/otter/otter-1.0.01.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils desktop gnome2-utils xdg-utils
+inherit cmake-utils desktop xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
 HOMEPAGE="https://otter-browser.org/"
@@ -37,9 +37,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
 DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -76,11 +75,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/pybugz/Manifest b/www-client/pybugz/Manifest
index af24380a48d2..de3951ebb75d 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13.ebuild 1102 BLAKE2B 6ef2a50499abc270d2aa9e8067f43c1c0aae9e75a6e8787399899bca1a7f4daf777ed0692697f566d31ef296679630c7f6f1293f4f1525b140be6508328fdc5a SHA512 4f3745f91ba769629f069069ce92e4ae09868ee3c8539768135781fd79594e8c2d0a39e4eeb04340c7f4916330623c8897f80d6d15ba3b29e5b9cefaa26f72b7
+EBUILD pybugz-0.13.ebuild 1108 BLAKE2B ca44919364b091e49eba55407415a9bd3804990e5882e9ad57d17045e27cb05a07e5cb4c5213903aed928099d7ac9a66c2bf93f4e24893d87640da371fcc3b94 SHA512 d6a84122ec4428a00f1bbd34056c44649367ae3cbfba1d357871b4d756db6bc1171d5f0cf7e83a44f17bac64ebd0390f032fff1d8f353b8505e8a48aaaf3c840
 EBUILD pybugz-9999.ebuild 1111 BLAKE2B 2eca0c05afa5e22fb534af440e0d050121bdf00d9f58080bd41cddbc3f85f315eb3f2c12269272a5ef4a0311883f2daf59e1b09eab946e4e43053488bf6f9a49 SHA512 fdd3330194af37629fdcbba42b8a54b65d60d00fba23810dc02d98a744c6f728930d4085840be247595f5fc718d5685ce1e3cb69fb02c2af017a7582f2642653
 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 c353a5bfe78a..92e801721171 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -10,7 +10,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 	inherit vcs-snapshot
 fi
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 3a137151b2cc..8657fcb91e69 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,16 +1,11 @@
-DIST vivaldi-snapshot-2.6.1546.4_p1-amd64.deb 61549320 BLAKE2B 86fe32ccc8c1522ead2ed2576acdd2cad7c4da42beef8b4f8080119d7a70377df76bafe4fff638d25984fea29e79365996901da8dcde3fcb84a71d6a54621f11 SHA512 d6ad263464a22f75eada9a12eed53e40c43a838e15abc53e1a0dc858428d7c09b68466b5afebbce487349b8284815134d884f000e6a226de9ed367d51bfb761e
-DIST vivaldi-snapshot-2.6.1546.4_p1-arm64.deb 55586020 BLAKE2B 95e77604e482d20054e22f5f6f690d4a63dc657e685095ebc084a77aa908067d715c9ddfb917a5b90e5ff38ecde7b31f24aebb8b114c1a997f0ebcc5eb4d0a66 SHA512 180d15981177c9510061a2116471a19abffd8cd2f6e1d7234bd4d5eb169d6e219d851fd90dc868de38b55983cda1c23a33c01c59b124ec2f37b89b423abc8dcf
-DIST vivaldi-snapshot-2.6.1546.4_p1-armhf.deb 54702208 BLAKE2B ba43bc7587ab7895145955a826ef1e4a8af7b501f5fa617420be46867b1037bf375b07c0ad44cd07eff36a98c99c14b83bf651685f6921508b1998f26a4c3b31 SHA512 8a29e9b921d8bffb2d6c9895e9f7c7f41cdfb2b628a3fba9c0f172eef9b7cba5190dfbce58ac6a7478a0a2fb0755c52d773f4bdbb6dd81e992632154def01cf8
-DIST vivaldi-snapshot-2.6.1546.4_p1-i386.deb 60962732 BLAKE2B 701c11120310f936ca76515b8305a16f606f58f0e477e8b6f2dc3bc2bbf70a9803a33705c175c9ecd37a5305ee3e0cd97b2877cf653ed800a1e0e40a837b9126 SHA512 24bcf2f5c507ae66ef40c4ea4138645db731c7bfc1717b6d616ceffd7237ca2f13922b63b0a031fa90906226e9b714be457c4951ba595efa120edbce5a86ee6c
-DIST vivaldi-snapshot-2.6.1554.13_p1-amd64.deb 61743740 BLAKE2B 4b2b43acb80da72af47f210d1fb5e0f0b2c1ff44edf9d26b2ed4f0d412992dad04abababf982af4a85dd8a8931cd15502d1a17683a40c3f886ccdcee00fcaea2 SHA512 8a7a3d2fb7513bb3d06f666f89eed27d3f8db08bd29dbc53194208b8cd25f3319185d5acd25a69c3eae652fc837731ccd0c4bdc8c201211de81519e5678e7ece
-DIST vivaldi-snapshot-2.6.1554.13_p1-arm64.deb 55822200 BLAKE2B 292b9e08eadbfd869c8e154bf7c82eb0fbaca43dad3b20ad3c09d4609a1f3890c4b8289267a302cf62e50df0bec8e7cc0f7eb3c636df5c84dc050080a845980d SHA512 f9b680caf36755d0f6d5af4731af5e7a9516706e11c109e69d2ee288a2741cb3da5f9f228cba82f59673d3527e091e80cc1b22dfcb1dfb8cf0c3d037ed460020
-DIST vivaldi-snapshot-2.6.1554.13_p1-armhf.deb 54950556 BLAKE2B b888453e1e6b37fee26c464670dc6369538c1e79f242b10198df0071fcbd67752262542edb10797d1dce9d7ad6305d101af136ae7774fae0e5d3e6c361699577 SHA512 643beaeba2370642f936dca31dd5e87ee59a46734256c9aa14f0e059d831f7c6f9c6e25e495ddc6d026a857a360339b62211b6d1a2b0f030379dc19cbfe4c398
-DIST vivaldi-snapshot-2.6.1554.13_p1-i386.deb 61064144 BLAKE2B 2669b50c1c685b8b0a3636ea79a8f3166c7fd9ec1b7b2b36c2e6c99bbba950c0e9c22727961c3cd99364a1f96e8675d50c4d7f5c63c14be954f56daac5ebacab SHA512 f6b7d5c7206eebba1a37592a138580fdd3d58f0ba15cbf700a1540e55db46de61fac4b6786b8b8dc4db4fca9061d9b022eaabd3e311ab45bb8389fc29075bcd6
 DIST vivaldi-snapshot-2.6.1560.4_p1-amd64.deb 62534328 BLAKE2B 6e83acb739560e677fa08d94df11770930d18a862364edd4a373c1a50bc0c1005d0f6957d7fbadec68a503b7a71f13e1f70e1f36bf6598599fe506e8b9ff5689 SHA512 973777848daa18009da8faeba9efef44006f3e93c4fd14edcdbf40e423b617f89adb4768e7a2a307a5564b6b3b498cd8c29f18f8191994472295d58308a98be2
 DIST vivaldi-snapshot-2.6.1560.4_p1-arm64.deb 56424484 BLAKE2B df08f39c5e374debbc2d08f9d375e2f422e3f35e1e6e9146a54fb502e980d505d54d6d1704b9e7b3262c5b283b41d5b1f0119092d19a6578109ce680ef884b79 SHA512 4ff497a5c0616b6513752438434f9698d081927b269e3aa260c19aeeb480915917aa69f846065fd62d7deec99d3816c35a3d608ca9bb7ac451649fcaa5b74eba
 DIST vivaldi-snapshot-2.6.1560.4_p1-armhf.deb 55575064 BLAKE2B c8a69e3f9153ce414ac0dae778f60df9a121fb1f23a1af1982dd1a25728e6f7acd0984aa50d5bc02a55f6fb312e8d35f342c4b23797eaf3aad76a47fb17a2d18 SHA512 2898c44255e0619bb1c1e74fff2a4c82a936c656c342c25279b08b609f758f460be98401b4e63a05f6d2bd8646948c27e713ce4a2b75f4b8018511f23f23039d
 DIST vivaldi-snapshot-2.6.1560.4_p1-i386.deb 60990056 BLAKE2B a2ae9a4c97295aea74e6417f0cae0c00d8c12dba7e08e6bec39de9542c921ccfae8a33491e27e8de3c67c26ae7da6b0eb201813a2d68eacc41821f9d6e8910c4 SHA512 3196998e329ab24b0e631d2b3b63270dd229e013ce3b2d7baa985149514af09d0cadfe9fd6c41cb770afc816ba61b3b0446549f8c9c9c4ee4c31e38c6dde50d7
-EBUILD vivaldi-snapshot-2.6.1546.4_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
-EBUILD vivaldi-snapshot-2.6.1554.13_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+DIST vivaldi-snapshot-2.6.1566.6_p1-amd64.deb 62531012 BLAKE2B 9bde451dbdf658e5e6eeea3d25241bc2a254e9e8e5f5d823d2052fd26a7985dddf963744d775d296b88a3ec85003b58d9ae302ba70a5a701804611a43274ec2a SHA512 5dfeefb6af502d5cb51a8981d389a9b55c94d3843386bddaa56348182b696f9225ad404ded03855993f4502fb5aa0086ffb4ee941c425164a49c2493f6595ac4
+DIST vivaldi-snapshot-2.6.1566.6_p1-arm64.deb 56455496 BLAKE2B e5f5f369422b26fb42fd069df30c87e7f8e64595acd8a8874ea3ac740bf6ed189c58233897cd7d4ab7005ef2f685b7334356fc3fbd90d9b914b677c8792245d7 SHA512 6ae1f1d4dacbcc278c96038ae201972fc94ad627a4a88ce9b9ba11e94bd2f39d47c497d09dc99b7761ba83c82fe5bd7c439950e96d98f8bc02fc496334d6dcf1
+DIST vivaldi-snapshot-2.6.1566.6_p1-armhf.deb 55602708 BLAKE2B fc532fe7eb6062d371b650a91be6da5105ca5a28baf8f8ef7abb3034e965d0fc3783dbef3e77eee4cfd355318659398a03f3d9f632863250a4c59cb772a468e4 SHA512 2f51ea7e16590b8bfb6a8073d6a7272c01b55a27d2584bd83e1d51637233c55fb0953020cd301351567ccb059e99b426841b69a6cd0420c18d5d362a8462a777
+DIST vivaldi-snapshot-2.6.1566.6_p1-i386.deb 60996704 BLAKE2B 0d6d53d5bdb93919ba367182548159964059aedd95bded24c0059e268af89799febc59d718678096182f9250851e6d83f25b29fb8c8b1555055bf2c3869f3766 SHA512 5105eeef8f743644075565150df2f3f404cee6dd9834460aa9bf2bbbb038ea5fc26476f7b173b5e25c65a71937d968f38244e81a9cdeda3ce07f48bef76d7881
 EBUILD vivaldi-snapshot-2.6.1560.4_p1.ebuild 2608 BLAKE2B 208c6c0ed454d136ff437ac0f62349e4a6b5865fc760f45742d278b12114662383f9a809ad0da460b61f6b376fe507c21b153ab4517d17fc204a513f7d6351d7 SHA512 15ba32e895442b09bc37f0c37ee936085692a25497e71250c673d4c2977c331df842ff1035d9f1f6e4438bd20630a3e12d59de9b52540bd90179758e278d5a02
+EBUILD vivaldi-snapshot-2.6.1566.6_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.6.1554.13_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1554.13_p1.ebuild
deleted file mode 100644
index 76ff637ebaa0..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1554.13_p1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	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_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~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/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${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/${PN} \
-		${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}/vivaldi-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-snapshot/vivaldi-snapshot-2.6.1546.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1566.6_p1.ebuild
index 76ff637ebaa0..76ff637ebaa0 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1546.4_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.6.1566.6_p1.ebuild