gentoo resync : 08.10.2021

3 files changed, 7 insertions, 215 deletions

diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index c10fb1398e00..f8efbe103a34 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-snapshot_4.2.2406.30-1_amd64.deb 86011392 BLAKE2B 9bf967c559dd7ad96a12f6021b8dd743595977e41e7e2cb1cfebef2bdc9a8fa118c4c75c08b698d60548fe4361a1f4f677e212a664534517d4cbaf82e7bcba95 SHA512 4a4d70c307df28108e492dc1fd49fec93ceea7a462ea897312cdd3063425bb92de6202d8de4e7b8730c5e7a31d32df495cb4f2be1ea7bca7c78975c6d7ffb22a
-DIST vivaldi-snapshot_4.2.2406.30-1_arm64.deb 81309832 BLAKE2B 1f15c8f94da09f30ba32b850979a6c1bd51537d2f19533af5658814378ddabe6d4ec9d3128c596fe1fb601fc9b608d131692facab1c7131a55c093818cd05d02 SHA512 08cab76282342fe258dc32a85ff383a7cdd459d32a6bc735dd2d09703bbaa52e23dda045161f24f460284de9f8120262d8adb3c11387c644b70172437efb1d20
-DIST vivaldi-snapshot_4.2.2406.30-1_armhf.deb 77344128 BLAKE2B 00f52492db3d6699956f09ef250250b30daaaf9f692373746087f4de6de7df45e127dd79f3ef0da4be36fdb3c0c0bdc5f4ea01d2792255b6826a946ca20e3c88 SHA512 1022db56cba286c58d094314133273d31c40c704b38f1e5de276b224b1af13f1772b912bc57d0d503310ebc83da8344496745ffb73bbb0d711736eab7c38baeb
-DIST vivaldi-snapshot_4.2.2406.40-1_amd64.deb 85985424 BLAKE2B c78a3a597ad0a8143549e4145f53389f2dd0bf6938b9c2dccb1d10fc00b98007e2a240d89e8e077b68e7447d6492b1d792d9a8d96465785e38e7c7fd967a096f SHA512 23ef49e82562e9e6396a7a8b3073c9868c506f8a1fcd8f0e03af5f11d8c4b0e1a20fb0b25b32300dc51dc7e8795a71417989bacae24f236b8a3e42e641c8e4c1
-DIST vivaldi-snapshot_4.2.2406.40-1_arm64.deb 81306320 BLAKE2B 0f1e4c493d32dbbd674e6c3e26be8d4faeece9392b0a22b1e89951a004aa1f02cefdd20e8fb2ec06e4cdceaaf4ae95c2ad0071579fbf71955942d0acacea6dc3 SHA512 f8fe22b0c2014254044c599faaba24ebb2d7871d3a795837ce68394d0b598ae5d99149c6f764b57ce50c717ab049569f669d7f92536c4600f4dd7c83f1d92cab
-DIST vivaldi-snapshot_4.2.2406.40-1_armhf.deb 77363976 BLAKE2B c08752b70e86f2141e2b3b79bda31877f2ddabfcad0332d9cc8cf1bbd6d1132ac69530c920f645b960ba5fe05ea8853670705db6da522c9ee6849b5bde0f47c0 SHA512 0299ecafb437e1fb07e9f032c66fd03a652f5e4ed18898a99b865a8da0697fe6ca8d890e0de79ecb0f1785a7068c0117f585781da4f82b9516197300e9143be6
-EBUILD vivaldi-snapshot-4.2.2406.30.ebuild 3550 BLAKE2B facd74ae8c195d935e5a7f1e732feaf52c1ffe780070668c64838e83ca6c20a8501e9d597c532368886d4999eecad51ba1353d395250426615c5a8f768024e5a SHA512 0d04512e316cfd3b47559073f48154b30eac1167189a6d25b86daa4652db4997908d655ddbe97436569fee4c3758e107df9362e45478b4bd18983cddf9ea0a9a
-EBUILD vivaldi-snapshot-4.2.2406.40.ebuild 3550 BLAKE2B facd74ae8c195d935e5a7f1e732feaf52c1ffe780070668c64838e83ca6c20a8501e9d597c532368886d4999eecad51ba1353d395250426615c5a8f768024e5a SHA512 0d04512e316cfd3b47559073f48154b30eac1167189a6d25b86daa4652db4997908d655ddbe97436569fee4c3758e107df9362e45478b4bd18983cddf9ea0a9a
+DIST vivaldi-snapshot_4.3.2439.41-1_amd64.deb 88036868 BLAKE2B f5f89adc1e55ff2982600353f5be130ee6b53a9bdf0a85e0898719b65018ae5b6bad7480b38680b4811d1ffcaa30f8e67bf8e19c189f3e6a952499b8eea5d53d SHA512 d5d6b2b96a9f9bb4b0a2cd5a84e01107e23ab06d0895209deaa0b4794d8cc4864c2f9a8d0702a1c35b8192cb1d15a7c1765177a2cc96c9ff3fe7bfd111274b3b
+DIST vivaldi-snapshot_4.3.2439.41-1_arm64.deb 82795244 BLAKE2B a2c39b06362c1d1f507b3bcc97d99309a25d313853e009192e6f51220f3195ef916758566987a7492354e4bab708983f7d191e56f9bc2e0fc4e4f8472afceba7 SHA512 1543d6a92b4577ef70f4749b7cabb21d90202afed06b1292b0c45a3f985d997ebac00959d9d739ed147f79efb653efc904fc721bd9376acb0e6915906deddbf7
+DIST vivaldi-snapshot_4.3.2439.41-1_armhf.deb 78980916 BLAKE2B 0f389dc4922683f3ed60922701b8904026a32c67ec2abd1320e0f95ea797cb4da04e3b9c38d04ba763cf01fb9b7adf9f6c3ad1010eb5df99492880d14dc8e64c SHA512 355059e74c3475c55397167a3905f142b739bf8c4786605e4a642f639adb575ee9d37b4471a77e383ab6dba8712761b33c4c24bba409a4dac747cf34a1acf65d
+EBUILD vivaldi-snapshot-4.3.2439.41.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2406.40.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2406.40.ebuild
deleted file mode 100644
index b00e9ee4c495..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2406.40.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	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
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	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
-
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-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-9999[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 -vf ${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-snapshot/vivaldi-snapshot-4.2.2406.30.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.3.2439.41.ebuild
index b00e9ee4c495..9fafe2ed2efc 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.2.2406.30.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.3.2439.41.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+CHROMIUM_VERSION="94"
 CHROMIUM_LANGS="
 	af
 	am
@@ -135,7 +136,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	proprietary-codecs? ( >=media-video/ffmpeg-9999[chromium(-)] )
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
 	widevine? ( www-plugins/chrome-binary-plugins )
 "
 
@@ -189,7 +190,7 @@ src_install() {
 	done
 
 	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
 			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
 	fi