gentoo auto-resync : 15:12:2023 - 20:53:45

4 files changed, 19 insertions, 17 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 4e70b54d7753..1f4b4e447694 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_6.4.3160.44-1_amd64.deb 105650520 BLAKE2B 1b311740f1de24d1e342f22e214146a1c3cff7f3c76d98b0d5f1ba43317b2ed49b7c52d22e9f9875d9119e76cd1cf50e6f02d84087c97a375e2a224f15f94da1 SHA512 373dc3b77802ed49a4806b49a0cade41de1b60b6c2f00b0a64fd2fc44ad388ad099e4554f9d84031d40c64b10896c003b45942b0825cc9669cde942795410815
-DIST vivaldi-stable_6.4.3160.44-1_arm64.deb 100312072 BLAKE2B 86075140c6960a541d1b56dc8c95e50d520cd3ec9fc6af60dffd22aaeee1a864c5dd50ac67c6ed311b7a7a6eb71047ab8bee7a00f5d43f205cdf6bfb5289cec5 SHA512 dd4264a8b401397d62915728eaac8f1ba9a00c10e99e8c38d92ba8abdf524435834a212c52be2b2107e4f8428ce6b4997f02882367f756ba420caeb4ad0c4858
-DIST vivaldi-stable_6.4.3160.44-1_armhf.deb 100950780 BLAKE2B 5bbdcbbba0dd88db7b39c1717d52fd686d978d382f7a755b454275e19182ce4a80d9650950145b245f7bcaedfc24822de63d63d3d854110e23027ea9f4e67362 SHA512 d26a424fe216eaeb5bd13c502dcde826bd9560678f48cd5b7fd8ef8cfb98aaeb79156501a7db2b82dba2ba58de9861bbaf73f731d9b0945c0a23f4fc0cdbea70
 DIST vivaldi-stable_6.4.3160.47-1_amd64.deb 105651576 BLAKE2B 662c8a469c6cd366a1fbdfceadb5a3ef4437abedd281937963c67755d1eb358ae3c0a0fa0d56f77b47e8bdea425fd90b320e8d2e1174df5bf3d6138d735e4521 SHA512 5aabd916bb78872994bc2083e2b900494d4a4074cd035082e5093780fa370db5a9d7f420d290f1089bf10699018a1e5a79def578cadbc74b7af730a7c6a5fc38
 DIST vivaldi-stable_6.4.3160.47-1_arm64.deb 100314332 BLAKE2B 5fa8fb438ba562ac18f475af120840a815156335f087abb66a469d160bb136103b7b76c11cc2172c31b31a42debccf465a058b603c92a0954a5090549f69b576 SHA512 90fa7d9eff4cb2ef2492cbde4c8e0adc7156d8022c6064dd99f7f90b7badef05a30a9813a0126b0389e95d22a6e4bb787ea199cb3d0ce6bed380d01fd7528123
 DIST vivaldi-stable_6.4.3160.47-1_armhf.deb 100960588 BLAKE2B 6154c7c2e482d10c36d342baa00b8fbf6e2aca229ca9faac2bf2560d3b266f5cc1e39379433edf56b5a8e15e8fbc43c57c5a981b7bccf2f4257edffa6a741c43 SHA512 3c382fecd2bb5fe2a65454ed784fc45c1daa632b2717a9b28c5aaf3770d7a9f8b82cae2b5f80bde7adb7d0d3656fc6b710a1b84ac62f2df8ef8e0c1f2a652aca
-EBUILD vivaldi-6.4.3160.44.ebuild 3713 BLAKE2B 860aab4b4425391da79762c6527d5049645e25b6dd5dcf3e42fa42629370f098f3358446d1fd92aeffd43e07474c183ad470c16860481f458b0e314c772f7e66 SHA512 39f3b107e984e215587b98ba892cd42285b365f3a6cebc673bf1cb75db37e81fbfa2057c727905d7a5916b90f8b1c0ee34f23e4f38d760454c56f582991c003f
-EBUILD vivaldi-6.4.3160.47.ebuild 3714 BLAKE2B f571a3f3e0a78a9291108b5d94f4a9810f33ea134456dec72febe688462bc0d9c271fa985a549561b57e3a57cee45672de491d6628fde34630b35b12104f136b SHA512 97ea4dce45a9fda139cdfc13542bb8aa71150a3c4fd4a97ad153c39bf1205439ff6ac3298ef7a8ff21c54f3860856395af864f2a70b8dad0e7961042d146c6de
-MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
+DIST vivaldi-stable_6.5.3206.39-1_amd64.deb 106977464 BLAKE2B 199383dfe17abef1efb936ad6370256b19aa2078d6924237fb9f7b5a20c5a6d3f7162077e8e0f7ede67911db4f61e389a7866e0c96f59b2fc387204968c1af97 SHA512 bb9255ea4d08ad0353a9df34d0903762dacc356ffd57b2d9393780bd37eb7d55e481ff74c9ea7b88b1f355830133c21f04eb7b7b458ccdb7f932588bda3e45bb
+DIST vivaldi-stable_6.5.3206.39-1_arm64.deb 100850000 BLAKE2B 96cdc6897c960ee82e28bf091e18f2c13e01181f323a0ed92a8f4f80942c5660d0ad526bce1d54bf1bc1e8ea21358622a6b5d281dadfd1d971672739c49bb5c5 SHA512 905bb3b7cf9a348d93532825f822b06dc35de37acb09a6c8ba5d453bb4c69afc67c47e3fceac20b9ccec53f7debae07489ee4c83d073767d9522cd6bc617b0c0
+DIST vivaldi-stable_6.5.3206.39-1_armhf.deb 102305368 BLAKE2B 8728b06c410165fb59205fecb6153ff99d8a2116197c2d1a6e0b08fa688a2fe536d57b7a2457c4e15bdc319a49ac9e9fa726feb3fbbcdeb19025078600614cb0 SHA512 d1a8c906b85f579438d78fcde7970c0890048605b46e97ebb15955e381837737959f027245a5af23051f0b78e29095ad2ee3304bc875d9df2903396623882200
+EBUILD vivaldi-6.4.3160.47.ebuild 3713 BLAKE2B 860aab4b4425391da79762c6527d5049645e25b6dd5dcf3e42fa42629370f098f3358446d1fd92aeffd43e07474c183ad470c16860481f458b0e314c772f7e66 SHA512 39f3b107e984e215587b98ba892cd42285b365f3a6cebc673bf1cb75db37e81fbfa2057c727905d7a5916b90f8b1c0ee34f23e4f38d760454c56f582991c003f
+EBUILD vivaldi-6.5.3206.39.ebuild 3850 BLAKE2B e70579fbf7b800aa8ec4c448b00db4037cadc3916da8b0da87d12563d4e16f3fe0970fe6e49368e20f796a97640ac350b195d028148a5c656c054516e9254a61 SHA512 4345235531f9a9f0b0f0dae1de1b452aef84e38a036472de6b1c78ec886bd427ffe7e5d6f02b777b50bf2b4606e3efc4dbef0dff3a9fc68d0f471697e5f11b6b
+MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index 1170096145fc..5e37797ec3be 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -6,7 +6,8 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
-		<flag name="proprietary-codecs">Use system <pkg>media-video/ffmpeg</pkg> to support patent-encumbered media codecs</flag>
+		<flag name="ffmpeg-chromium">Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag>
+		<flag name="proprietary-codecs">Use system FFmpeg library to support patent-encumbered media codecs</flag>
 		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/vivaldi/vivaldi-6.4.3160.47.ebuild b/www-client/vivaldi/vivaldi-6.4.3160.47.ebuild
index 9d522c106aff..1ad1c8806c77 100644
--- a/www-client/vivaldi/vivaldi-6.4.3160.47.ebuild
+++ b/www-client/vivaldi/vivaldi-6.4.3160.47.ebuild
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 SRC_URI="
diff --git a/www-client/vivaldi/vivaldi-6.4.3160.44.ebuild b/www-client/vivaldi/vivaldi-6.5.3206.39.ebuild
index 1ad1c8806c77..1cb4e268a82f 100644
--- a/www-client/vivaldi/vivaldi-6.4.3160.44.ebuild
+++ b/www-client/vivaldi/vivaldi-6.5.3206.39.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="114"
+CHROMIUM_VERSION="120"
 CHROMIUM_LANGS="
 	af
 	am
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 SRC_URI="
@@ -109,14 +109,12 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-IUSE="gtk proprietary-codecs qt5 widevine"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 widevine"
 RESTRICT="bindist mirror"
+REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
 
 RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
@@ -137,7 +135,10 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/pango[X]
 	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -205,7 +206,7 @@ src_install() {
 	done
 
 	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
 			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
 	fi