gentoo resync : 25.01.2020

3 files changed, 2 insertions, 131 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 641c797f275d..57db254c1913 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-2.10.1745.23_p1-amd64.deb 64724924 BLAKE2B ce8f82ac295ad523a59e52c5ac27f00d382ff2049d5270b8151f6d0e509ebe2e7735f9027821090a2bd1c1ea356faf5a588151ffa919e627a7255ef5c03b2e09 SHA512 2a5e61b07c8b0478a42215f91210891032c51d8e33d6f27cada59eef6cbf32605f255de0d91c51b4658b82b0f55062967ccb8550aa5c3f36cd58c4fc25cf3a03
-DIST vivaldi-2.10.1745.23_p1-arm64.deb 57906160 BLAKE2B cae66d9e117e00a77573b4dbd87fd6ea71c3dcc1f63d892480f22cd35d777fb273feaab8be13c8b1b691bf0674022291aefba692879f43a006b819a82099839c SHA512 9d13d37cec2a62d90eb3394b8fa1437351154b62abb98cb72de6a2c92714c73508b0d07dabf4e4ad854bc497cabffd395d8498749d9891ddd3bb3a48aa601452
-DIST vivaldi-2.10.1745.23_p1-armhf.deb 57139136 BLAKE2B 749b30b62ca21d2c2dbee9c18c2f9dc2f3e6e30513a0cdd0a9af069a2736dcbcc766aaf703997aa4c5494483f8af96be735c8fb46154b1a31c60080b74a5c5fc SHA512 fae2230d1ff01ee36aff0a1a6e60e7787b54cbba18f09e973b01a446f59bc51c0a20eea59104a3a640e0ac1daf5f955e46c30a184620ef2cfb3b7d8a866bcbab
-DIST vivaldi-2.10.1745.23_p1-i386.deb 63118920 BLAKE2B b71d0cda72c654122dd98d386baa96699e07dd607d226e30cb82469af02f3d5cf4d873c7d3e572ee675a1c27f9981a45315a31d9b10db18f3de39cef21cd9c87 SHA512 6280818bfa9fa90cb6716dbf39b056d66d578b250ebc2af47c064f074ca09ce4a62fcd25b950a09334a6e032f1fce34cd5de31cfac3f67f004638004150d3ddb
 DIST vivaldi-2.10.1745.27_p1-amd64.deb 64750900 BLAKE2B aacdc87625f47704a79bb9d48b0f1fe3f0cf98a64ec2bb970f06458fe2be304e3c02bcc62bfa6adcbea2bb7119e030017e610faf7c7d6dcf2857cfea16acf822 SHA512 21b1fc6d72c682ab3088ee5c13014850af6736b9f28543eaa85253f2a460094cc904202955ea841a6b42ad2c004b90f49690330a177a435a2281831d80b63f49
 DIST vivaldi-2.10.1745.27_p1-arm64.deb 57909300 BLAKE2B 1355c2df495b3a04f0c3ddde92ebd4d5b23274646454cb59f1909c5527bb340b885f3740f4b09525b73a50e98f5d70c552ee9173e33ea39de416e6f800f3618c SHA512 476f13c57c03abc60b18749437a264e9c47e6e644f9b9cf5a2df482d9f0246f0e8bcc886314c8d074f28323c73be92ca5a68bf555d8dafea1158495619795c41
 DIST vivaldi-2.10.1745.27_p1-armhf.deb 57148984 BLAKE2B ee46ea7c482f646fbbca85b14ad1460671e5c5d4ec7c7136a5823cb25606ae694599a48d72394d52e004b4ab9837453ce64b56a5d44532435388fb52e21d644b SHA512 0f58b1a354cd4fd9392e123f67fcd30b532e5a858f8a9ad8329f74914afcee70a3895878855b69a0d1d149a521a768ed7509271fbce6e4bd0cbb0d1e6a0285e2
 DIST vivaldi-2.10.1745.27_p1-i386.deb 63126284 BLAKE2B 01e34738aa3f0e2098e8b5ae6ecd641f288b941b079a4e685f3e4f4c4920e224aa41fd25ddf04c371282db46421c6e29c9c20909a1fbd97d85a23b189cb899e5 SHA512 85db226a73bc20251a807c376c235789a6e52d83f7d574d6043234ca158f1033c7433abd014372dbcece33a256b3b5cdc5ee4bc2a569f93e26cbdd551b20ad97
-EBUILD vivaldi-2.10.1745.23_p1.ebuild 2938 BLAKE2B bb2dbecb0f7aa0b508528ab65a8ad1838fae5665daa35065edb8d8c9ae5e28657f25beb48d418859ce40582140c7eb2e6a2c2c2caa7753d7fe3075b7447ef3bd SHA512 1a63ba39f872136633fd9929572d50a8cf530280a15b3341938b5337a798e3b6d1df6feb8d70b1e97042a77cef9bed89f03d9b1580baaa7937ff6838962cdc85
-EBUILD vivaldi-2.10.1745.27_p1.ebuild 2940 BLAKE2B 189ad5684eef87514fea4a3c5b85a1fdc3caa9998a0c8035cc7d492c52fbf1eed5b0eca1bd0e9fd8c32f4d08bf44abefa5da4e4448bfd52ec1a7f7bbc438b517 SHA512 3c6fc51f46afa7e7c379331a493594cf12fa2bcec86d91215003ef979c8f82600aa3b8b8d653775dbe9d4ce099c74b112115789c4882be3d7665886281e459ba
+EBUILD vivaldi-2.10.1745.27_p1.ebuild 2938 BLAKE2B 43e422b5c3d88366f19a31c64952f079eace39e2f4c03c47375e126dad5d808603970285e8676c3188e3ee84ab582ae99dff2fef154f13a55ad6d06890ebcd62 SHA512 c3d76ae34a73988a34c00165f9d3f2c8e499f568df123a8d9562191a4b7112c9638b76739aeba97995f6448afa56af5167694afa4018e9647535a0fc63631cdf
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-2.10.1745.23_p1.ebuild b/www-client/vivaldi/vivaldi-2.10.1745.23_p1.ebuild
deleted file mode 100644
index 57f6b491d2eb..000000000000
--- a/www-client/vivaldi/vivaldi-2.10.1745.23_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="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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 )
-	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/${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} \
-		|| 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.10.1745.27_p1.ebuild b/www-client/vivaldi/vivaldi-2.10.1745.27_p1.ebuild
index 878c1ba28cae..85154383098d 100644
--- a/www-client/vivaldi/vivaldi-2.10.1745.27_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.10.1745.27_p1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="