gentoo resync : 11.07.2019

3 files changed, 2 insertions, 130 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index da390e191ce6..ef94557aed80 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-2.5.1525.48_p1-amd64.deb 59499592 BLAKE2B 09f33e250dcbcead693760484a2444376ef52b705b729da84870a42d45cab6fb4e762900462714c51b037ae5d23bbff51c1744cfb6987a97b1a7c29bf240d69b SHA512 ddcbe9c3d9f26cf6679cfdb6341b0fa991e1dba46b44ca8baf9bbcc7ea739e61eb61d2eac056ca98266e607b815f45cae7969bb39f3687bbc1fa219d9ba927bb
-DIST vivaldi-2.5.1525.48_p1-armhf.deb 52885016 BLAKE2B 870b3dda45a8fb5f5ddc3a2543e7c1efc4979f4d193a1d5228cecf4fb270b8264042f7845081c6aa19f9f8ca557574b394180194895caea4718da418b57a7266 SHA512 a887cc0442d81c9e56d2e3e79b4e824348d7186bb09eda9512e75a4b6568fc6cc7cfbc815f72e1e9a0ef6091c99f99e69d9c5b9f8422cf91e1e462642f1ee92a
-DIST vivaldi-2.5.1525.48_p1-i386.deb 58071364 BLAKE2B 00a4fdfefea9f85a5a0e406a5f741310509659f73137df83c89fa4dd3fe6ea8e5cae7f6003f99179e13b2154a86ed50530413686989bdc2b62556b6dc8a79625 SHA512 d4567413c7ef15bb33bf11a462a62d6a45c0f952b945ff5b476f8aa8c85bf48c9ea4e3dc0f099cba02c1aa6dcf16bef2e2b224dd922f4507247dd5cb09433257
 DIST vivaldi-2.6.1566.40_p1-amd64.deb 61151748 BLAKE2B b87be9d93798c8b94826d83af62f0c18a9b9e31cbcd8499ac2b00b969b92953dec0c4427f4d242180982648592f984b7477be830bf8899e4d3eff704b5949cd4 SHA512 3a5c68b8660a1940f4a9d6a949e112c9c966d4ccad8608e9e84e6ef33c864701b930b9a51ac04e359e0b96213324cfec987c9346a0093b70df722430d338692a
 DIST vivaldi-2.6.1566.40_p1-armhf.deb 54411476 BLAKE2B 515320db7da8cb2eeb0fe8c639921b41d0debf7d19c31e70694603aa06516d282e8ce05c75230ba706364af40892f16fd95e92e07619e51c1f33defc24926a28 SHA512 f60b6b6572f8b22c921a8f2fa03171a6e09301ee0a09617dd2addc307466a2e941e77b6f495221ef96b2f72026c50281a20fc074875aeaf1bba10cc8d4463e5c
 DIST vivaldi-2.6.1566.40_p1-i386.deb 60685292 BLAKE2B e30cf79718238e4d221749668ca3098b5a6c39b764b34edb7d3cb428d891ffcf949b26f004babb0207388241882cf35adf43dc9d65f21ea6bea380c16edd2bdf SHA512 8a873436af9c0059e6995b6d0905abcd14adbe3643795358ca43812d98989bc3f7a5a0034e86b188b245a90302a078ab2c8b219484a0387fb3e57aa190bbe202
-EBUILD vivaldi-2.5.1525.48_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
-EBUILD vivaldi-2.6.1566.40_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+EBUILD vivaldi-2.6.1566.40_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi/vivaldi-2.5.1525.48_p1.ebuild b/www-client/vivaldi/vivaldi-2.5.1525.48_p1.ebuild
deleted file mode 100644
index 479dfcff4842..000000000000
--- a/www-client/vivaldi/vivaldi-2.5.1525.48_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=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_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.6.1566.40_p1.ebuild b/www-client/vivaldi/vivaldi-2.6.1566.40_p1.ebuild
index 69ed6a41d087..479dfcff4842 100644
--- a/www-client/vivaldi/vivaldi-2.6.1566.40_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.6.1566.40_p1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="