gentoo auto-resync : 12:12:2023 - 11:25:13

4 files changed, 12 insertions, 235 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e63e84cca3cf..1bf7e7a693bf 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 21c185c357a8..c6596a4e3660 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,13 +1,9 @@
-DIST vivaldi-snapshot_6.5.3201.4-1_amd64.deb 106892644 BLAKE2B 9db9d0027e9b07ad9acc200b29f2b4efa7aa9531246ab66524b6d1eda4bb5cd14c8171fa8bc81bad806946ac65c51e987af739d64584491c90844f8a03aa027a SHA512 f4baa645eb18391c9b64c1733ccd1adccaf15b72cb3754c5a579a45e18018403e426687e905d32f69c500ea13f7627737f5bc742432b6750a61cf5c2d600bdee
-DIST vivaldi-snapshot_6.5.3201.4-1_arm64.deb 100779560 BLAKE2B 2de3cea82f927cad25cbf96ad4d5a2fcbb1c1c60d41a0d45ccef1024babe75fb87134fe241a7bce8db91fe05aee0e9ae624b570b77d0810f683e55cae3911736 SHA512 80f3aaefffbf311cf8f7253f2ee33051bd5eca0261d20baebec9451cccccf5f6678e25eaf761d8ea35f3e778a41c10cbc324c615083ac9b81002c23f2eab2d98
-DIST vivaldi-snapshot_6.5.3201.4-1_armhf.deb 102205784 BLAKE2B e12c1a0e46169a9b194c35006bd624c8ac043f9a21acabb65cad689ddb7fc230649058c45c9f60d3c8f5c75131c0f3bb2c342cffa5ce152fc156c8d2cb4e8f75 SHA512 282577a5946807ed619b7d622b4f1a06bad18b18cfabe45b11579877edad8f54a9921ffa36bd875712288daa781bfd58003a4022e797d7700c0e85c9e1c23d4f
-DIST vivaldi-snapshot_6.5.3206.24-1_amd64.deb 106846764 BLAKE2B 5f280e64bd0b62aabdb10526d8880aa683c17e0175f18b3fc1f64076f26ccb3b2441952d9975222ca6de2f640b18d29dadf586bdf6d4e1b45a97eed6f662f5ac SHA512 921daf6447d5c797582266594b785b9de71dfa72b8eb1a947dc14624299c1254f17623d49a6df1f393c25f46c9339d1fccf900276160a9b59524c69d6c5e161f
-DIST vivaldi-snapshot_6.5.3206.24-1_arm64.deb 100811600 BLAKE2B beed04a690d97e8a162c1b0bfdcfa36acdaa8fc7406710ec710b76110448c4ba84a94129f9b4f234f4f813ebc1827399f828ab6f584e8b080bc5d73c8b6423cf SHA512 a17a67e8929f7a61535e9d2e96d9654933bd558dfaa9da3a0609192ba5731c5910010e2d16e62b9769a10df56e57520715404688bbda89eef1f81e72b91c5cb5
-DIST vivaldi-snapshot_6.5.3206.24-1_armhf.deb 102242064 BLAKE2B 430d87cb115abe590f787d9100ea44a1ed5a8b1313a7184ddf70a24f1c5f50c37a2e2362ca121b748ffcf181f429bf60f7621b0f4618124e3faee278c1a4c6d2 SHA512 56939bd575a430c984ab03f2b46354701fdc2611d1022a4a13a3e8b2263b4874aa91f037f197bf4c5549ff43b25c63094eee20287aae26bdc48341b306977422
 DIST vivaldi-snapshot_6.5.3206.29-1_amd64.deb 106760208 BLAKE2B 68ff92af1e5b60cc3c048eb9e0dd1cfeca7ad556341a01ca4a1709d079d4ee6f23a559c7cd03e96913b3fb9eecfea4e5cc0e703bd770ab2697810ea8fc09a1ba SHA512 5def4d22abba6352bf20157c42b347ec3f2762c8f38c05032ff93db550367897cc265607e5f6a33ae058e0482e3b0eb518cc78754c67521095aad080afa77de1
 DIST vivaldi-snapshot_6.5.3206.29-1_arm64.deb 100824792 BLAKE2B 51585bdc72acea5d18035a76cf7ccbf136b78a4b1c863de4c869bf91c5f236dc45e562fb87094d995c14997d22936f45de4fadaa98206dec29d56b9e267136a3 SHA512 8b15c477bcec65ae3235b4b987a19db5a4037237298bd33e3a164f3ee2608eb0b2798cdf57fbf4d5e980381383506140537a48d1a40c4dd40adbaf016c78821a
 DIST vivaldi-snapshot_6.5.3206.29-1_armhf.deb 102259264 BLAKE2B 4b413ae0561c18559eda8b21cf22fc5b6005879eb23a3ae206d81deb6238fa14342160cd75a1398a2bf9488e939d870d131373ecedca9f7282828a698ed906c8 SHA512 4e0bf530c37c7c0e39279c1cf9141aac62043aea92d34081478e1528c3c4caf0aed469a2a4120cad49a6048ddcd0c4516f9b2169e63602213342a0b694a3b780
-EBUILD vivaldi-snapshot-6.5.3201.4.ebuild 3714 BLAKE2B f571a3f3e0a78a9291108b5d94f4a9810f33ea134456dec72febe688462bc0d9c271fa985a549561b57e3a57cee45672de491d6628fde34630b35b12104f136b SHA512 97ea4dce45a9fda139cdfc13542bb8aa71150a3c4fd4a97ad153c39bf1205439ff6ac3298ef7a8ff21c54f3860856395af864f2a70b8dad0e7961042d146c6de
-EBUILD vivaldi-snapshot-6.5.3206.24.ebuild 3655 BLAKE2B 50bb756cb781d8dc6719fc3a6e89b08588cbde1928d5e06ece28114dd63a8f36d690bab849ead876de4636e2460bd40c1178d2adc08b0a4e5e90b8a0de6526ee SHA512 fb57d839fca16518f860acebc6257d53626ce2a7c033a6e387fc87ba419b70b9016cffd97da59c83d08e3ee01b328e18ea463ab2f31d873782f6c28b2174e104
+DIST vivaldi-snapshot_6.5.3206.33-1_amd64.deb 106764976 BLAKE2B 6e729b11894a84f3c97e98a442bc34372c1ccf1e8a7fffa1b5e49ca274db7622fb89f3ff447a011a9ef2a8c2fb7eddc434acd083c1dead5420c685a57320f1ff SHA512 dd803247dc42c2fb3de96c4db09e40f5f7ac11a52b01c2daa151cdeb1d8aa6946f9990c6f2627777825147bdfc7ed563d51b62e54e413d17108210c80f090d9b
+DIST vivaldi-snapshot_6.5.3206.33-1_arm64.deb 100813748 BLAKE2B 7bbe0545412af9db0f9d0a675e58f93d440dfd916381c7a9fc33c4107ed1568c6d1de11fa030e01c5542626aa24077893e33f65e9fa5209dbd2da1f6cea2c7d5 SHA512 3f3bd53ac3dc32c0187fb757f3c6eee898d93195f18b044d182b74995d09dcd0fb36f75cd5d145c1ed80ad90ab7d115a5911ec17691e2ae98b23850528844b10
+DIST vivaldi-snapshot_6.5.3206.33-1_armhf.deb 102263852 BLAKE2B c6aa16c576f058d14beb555ee877a7a36b4b184fe47e499a29202ad2f4d94aa7d717d03c25a56c7ef6c1b368cf728d1b2db1a4e66b4b8f4ecc02f670032e6eee SHA512 36933762994acd7ef3a898256e9a94ccd833cbb5012dc3b405199e3bb9511de8321a9bf3b1f8b6cf6493dd857dc5016628bf007df66ada3c1dc396ee68755116
 EBUILD vivaldi-snapshot-6.5.3206.29.ebuild 3850 BLAKE2B f955384d5b46cb329655d7d2c00f872111844d87fd382427f55ebb7ec71a989cfa772b6aa5d8949711b9833ecd58e1f0ceef22952e4b547d0e2fbace52a75740 SHA512 1cc9536edac195db4a10d9568370a30fe64e10f8111e924024c182b2302584620a7367d1f2af1d52a9c876d768b2868eb0e0956a6d03881af9497b9426866dda
+EBUILD vivaldi-snapshot-6.5.3206.33.ebuild 3850 BLAKE2B e70579fbf7b800aa8ec4c448b00db4037cadc3916da8b0da87d12563d4e16f3fe0970fe6e49368e20f796a97640ac350b195d028148a5c656c054516e9254a61 SHA512 4345235531f9a9f0b0f0dae1de1b452aef84e38a036472de6b1c78ec886bd427ffe7e5d6f02b777b50bf2b4606e3efc4dbef0dff3a9fc68d0f471697e5f11b6b
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3201.4.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3201.4.ebuild
deleted file mode 100644
index 9d522c106aff..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3201.4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="114"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	ca-valencia
-	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
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop linux-info 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}_"
-
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="gtk proprietary-codecs qt5 widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-CONFIG_CHECK="~CPU_FREQ"
-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
-
-	if ! use qt5; then
-		rm ${VIVALDI_HOME}/libqt5_shim.so || die
-	fi
-
-	if ! false; then # use qt6; then (TODO)
-		rm ${VIVALDI_HOME}/libqt6_shim.so || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_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.${CHROMIUM_VERSION} \
-			  /${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
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3206.24.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3206.33.ebuild
index 724a622c2f1b..1cb4e268a82f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3206.24.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3206.33.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="117"
+CHROMIUM_VERSION="120"
 CHROMIUM_LANGS="
 	af
 	am
@@ -109,8 +109,9 @@ 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
@@ -134,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
@@ -202,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