gentoo resync : 20.03.2021

4 files changed, 4 insertions, 211 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f61183a6b564..4347ce9b081e 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-stable_3.6.2165.36-1_amd64.deb 77546152 BLAKE2B 92e7026902ce28666076499926261db6eaa6828c9fae077d1558192b6f66f60bef6d95c89310dbec874683c6d172484884c29e7fed020ee8ac2048634ad0eb2b SHA512 6e1698d78dadc383626133bc4a28add034bc4660906e5f26347396a57e03f68eb4d97c8e5db9e89393c044515f8f55bb3b6177117b7b2f3cc79586305d07a2e5
-DIST vivaldi-stable_3.6.2165.36-1_arm64.deb 69809548 BLAKE2B b95b4bc62639c46add743a2f8d66edbd2e6981bff3de7d7f3828ea82efe3295350a3eabb96a4a2cf41b45156c9b64f64b067208f73ca30c70dd716f5aebce12c SHA512 4131ae1567c863a0d30aba9f333cae0c81e01d29c034543a2092f74ee08df038351eadddfc95bb967319897d8b613e64240c10f9f588c0a73c3d57e88ed19ac3
-DIST vivaldi-stable_3.6.2165.36-1_armhf.deb 68623288 BLAKE2B e814f57cd530024a4a179764814c6bb73c6a876c5b98f9f117fa74d49f3157c95e980dd82529059c8e455cb47da3c56c8d311af820391b30891992807993a534 SHA512 d61851cc3897e974f4edeb81f401e6daf3b90fba7a4b10bf2a98eecac2068f0d3f469371dc2825cbd45afa5cf9931c26fa78fa6e658048cca8cdb93bca2df35c
-DIST vivaldi-stable_3.6.2165.36-1_i386.deb 74279848 BLAKE2B 4e3a6b4fe3ec3ffb904457794e86f8f7c22814be29a0d193cf2b8bef2b9f21aa2b8e52733f92c7491accd04ec472daf10d53b61ea2fe7692d22de5a6a58a8f38 SHA512 685802a1f6cfbec92b7bf7d0ca777b153c3192c0e1bd9f9b23fc4d32f2529b649353edf8c7b298f44be078c3f61f79203703d639458954ac4ee2e2a3d00a5ff7
 DIST vivaldi-stable_3.6.2165.40-1_amd64.deb 77600092 BLAKE2B 9a2f2ae41c16a2bd1b2cba006c80eb8357b6eb88a2dd2cae001752741fca7bf7e8956cc3d277e39f09b904af3fb81eb6ae55adb15af2808ad824898b7cfa80c5 SHA512 e17a14dbfebd283de980cc2b6ddaca8fe7fe76711087c2cde3dc7cacd0c58521f6edf7546891b81bed428965b86e9341d20f134c2fdd792b2d061ad2c3f7f575
 DIST vivaldi-stable_3.6.2165.40-1_arm64.deb 69850704 BLAKE2B c88641c0ea45771eecf2369f89f18b2991931ea67f545c93ae3426b5561613835132f5a285d5f267b2e0981c9ffb65402a0016ec29fdabf381e6a16abe06c9b6 SHA512 026c58ee3c34497f6c5f31cf96b9a202efdeb2713301d5699267ff8b8fb32618c6c70e685479862a9c223dcdc32a0ea024f7334c8a52e18c5ae8b66bb7fed97b
 DIST vivaldi-stable_3.6.2165.40-1_armhf.deb 68650992 BLAKE2B 932c8df157717d99d2cd7963217fc0ecfce87a2118448624eae410311b706af468c1d6f8c0baaa3f8b8d2513eaad92e26417ca10f5511f5f76cb6f5cc7835b7c SHA512 e319733feef35c6b506deb21a21e4f6ee46acfcc83788bfa91d10b723146c870ec5108e433c57bfba37a3ba84da2d4f876a066a17a8f180e61933968585aca17
 DIST vivaldi-stable_3.6.2165.40-1_i386.deb 74317284 BLAKE2B b3b7a2a675128fea0b576dc7ff2b08218ee6c9796bdfaca91e8302f6d0de63173e8ab7f2f39232ffdc020779061724cebf599fd6e29f7eb1bf9277a271d52d3a SHA512 5628ea1ebaaa8b8a647b3e07c27aade8f45d448e21b38f19d9fc3749dc919a20f09df111098b99f5e6ec11146557f8742d5b40d3fe23e5bc02c4204fee7392c5
-EBUILD vivaldi-3.6.2165.36.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
-EBUILD vivaldi-3.6.2165.40.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
+EBUILD vivaldi-3.6.2165.40.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
+MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index 91c75704fe9c..d177249115d3 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
deleted file mode 100644
index 8809e8c798d8..000000000000
--- a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2021 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 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-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]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
index e3d12da4e30f..8809e8c798d8 100644
--- a/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
+++ b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"