[gentoo-commits] repo/gentoo:master commit in: www-client/opera/

["Matt Jolly" <kangie@gentoo.org>]

commit:     62c3b36196cd82c12b76f52aadd1d9800c2f5083
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 08:06:22 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 08:20:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c3b361

www-client/opera: drop system-ffmpeg option.

While this works in testing, we need to stabilise
ffmpeg 6.1 before this will work on stable.

This was accidentally pulled in via automated updates
and should not have been in stable.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 .../{opera-109.0.5097.38.ebuild => opera-109.0.5097.38-r1.ebuild}  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/www-client/opera/opera-109.0.5097.38.ebuild b/www-client/opera/opera-109.0.5097.38-r1.ebuild
similarity index 92%
rename from www-client/opera/opera-109.0.5097.38.ebuild
rename to www-client/opera/opera-109.0.5097.38-r1.ebuild
index 180caf162698..a97bb25328be 100644
--- a/www-client/opera/opera-109.0.5097.38.ebuild
+++ b/www-client/opera/opera-109.0.5097.38-r1.ebuild
@@ -49,7 +49,7 @@ S=${WORKDIR}
 LICENSE="OPERA-2018"
 SLOT="0"
 KEYWORDS="-* amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+IUSE="+proprietary-codecs +suid qt5 qt6"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -80,8 +80,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/pango
 	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+		media-video/ffmpeg-chromium:${CHROMIUM_VERSION}
 	)
 	qt5? (
 		dev-qt/qtcore:5
@@ -155,7 +154,7 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
 			  /${OPERA_HOME}/libffmpeg.so
 	fi