gentoo auto-resync : 21:03:2024 - 07:00:13

17 files changed, 417 insertions, 384 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 74c1300313bc..8b9519dcd477 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 67bcd0c852df..0251fe5b2462 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_123.0.2420.20-1_amd64.deb 166135054 BLAKE2B 62bbd49988d41821a11fafb6e3cedc105449aa432bfe143ab6f850e8d8f89192d5f0413ff81329b1e6fb0c841b454dce92b51984ee577f9292b5636bb2f8b400 SHA512 c9c350f0e8bef4b84e39f73a46a24c55edb8901b0043f7b0639ebc433a604d7ff282a4b2b5df09938b0bee9b4e963800c2d11629a368c8d6f7c93a58639d15d1
 DIST microsoft-edge-beta_123.0.2420.32-1_amd64.deb 166189586 BLAKE2B ef3955cc354cd8828558d813f46cb8005024f0360269784590809765d5baf763338672c29a51ab7ba9f5644028ed77bd3327b60476700d02b0123090001e469f SHA512 868462dff859a5912d7f6736c7af5655787df6f34aecc925af18cfcf3b40cc172b6e60da115300b6c049a9e4f87a73e17adae14e6266f15d4a5904ee56be2acc
 DIST microsoft-edge-beta_123.0.2420.41-1_amd64.deb 166231134 BLAKE2B 8c25d627c17d130718729be83f03e610d87ad11f88452d21fab0763e61c61f35782be212fb5e2aac23dde75fc52ed46eb096abbb799bc3e0f35538b58d55fa2f SHA512 3efd954200ed60972f3799d25404adcf73b55fa22430496db8cb35b4c9bd2e5979aae0e34545b000356b3d8f58f85436bb84ec99b39b1551e55010975a5552a6
-EBUILD microsoft-edge-beta-123.0.2420.20.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+DIST microsoft-edge-beta_123.0.2420.51-1_amd64.deb 166236090 BLAKE2B 1ec2378ce8081ae758158f4b1099fa1008d7aba1c83ebb48d420b0239aa7c810442cdc10f65f89e2ecf6bb8725db4fc02427b0aa003deb11c6e4be962ca74bcf SHA512 1cf05dcc23a48a17962d47d11325f6d825e61fe8e1034cf2214bf3c0f5a2310138a840b1725bbdfe3a2aaf307c8fc91fe412927c8e0c4b8591981f8cedfcc29d
 EBUILD microsoft-edge-beta-123.0.2420.32.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 EBUILD microsoft-edge-beta-123.0.2420.41.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-beta-123.0.2420.51.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-123.0.2420.20.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-123.0.2420.51.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-123.0.2420.20.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-123.0.2420.51.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 42d22dab6e40..6b54e43f1f94 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,7 @@
 DIST opera-beta_108.0.5067.14_amd64.deb 115510280 BLAKE2B 01671adad09c457f397ae1f62001ed9cb4f833c7413b719299f307704686ea6d3bf3713582f93b2a417c7e076b5c95b9f9dc37a16bf6d42390116dc9428093ee SHA512 1839af51c996f09aafe777505267f1c6f97334fd02f9840a693540b694761b31a5419687ada78bb3a05783d3315bb3b4e62b55ea9fd86692ec10ccf158026239
 DIST opera-beta_109.0.5097.24_amd64.deb 115266488 BLAKE2B 02031e0bf755c111efd3e77adf639b5ca27a6325e94f3d43e20419dfa8c93170aa19d839d5d718fd5dfd94d28b1c974f107f2a99c73b3de27bce94c2a66c46cf SHA512 a9b19e07d9cd11bdaaf1fbee1ec765366994304d940711c66f9e041f5e8cca33d29ec158768c659bcf2bbe1b5914c5a67ef86800a4a0ffa27bc06054b55f80ca
 DIST opera-beta_109.0.5097.5_amd64.deb 115139344 BLAKE2B ebe2dbc2aecd0a79c1446cafc7fb4195cac2cf927f2e2f43413ec322007efcfcbb037f2377e973a40baf2d0eff7ce76cd88999d6578ff72be695831b20066520 SHA512 245bb6d45bf85b2d53f19ea015a2899853e43043f53216d3b7b2a87c8cf45b00a541df92840b357c09328c1ea4aedf70a6303ffce113d88f91d2c8da83763217
-DIST opera-ffmpeg-codecs-114.0.5735.9.tar.xz 1315192 BLAKE2B ef9a0cfc8c30ac0a837863644f3c2d5e78059575e2b8f6fda9253304f4815a39d021602e802dac7e1d5a1685aa5015a02019c4a0399f0bdc81136f956cc1d55f SHA512 bdad66bd5d238bdeb81a4e2a956f0a814633360f05c7bed2161df9506d2ccc444445ba452cc8974c755fe0d3f46adceb90324a472a5dac72e9c65391ae7a841c
-EBUILD opera-beta-108.0.5067.14.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-EBUILD opera-beta-109.0.5097.24.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-EBUILD opera-beta-109.0.5097.5.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
+EBUILD opera-beta-108.0.5067.14-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+EBUILD opera-beta-109.0.5097.24-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+EBUILD opera-beta-109.0.5097.5-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-beta/metadata.xml b/www-client/opera-beta/metadata.xml
index b26bda26dc59..43f810908023 100644
--- a/www-client/opera-beta/metadata.xml
+++ b/www-client/opera-beta/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
 	<use>
+		<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">Enable codecs for patent-encumbered audio and video formats.</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/opera-developer/opera-developer-109.0.5097.0.ebuild b/www-client/opera-beta/opera-beta-108.0.5067.14-r1.ebuild
index 4580a368fd6c..ad276bb735ac 100644
--- a/www-client/opera-developer/opera-developer-109.0.5097.0.ebuild
+++ b/www-client/opera-beta/opera-beta-108.0.5067.14-r1.ebuild
@@ -39,17 +39,17 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
 LICENSE="OPERA-2018"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -79,6 +79,10 @@ RDEPEND="
 	x11-libs/libXfixes
 	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} )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[X]
@@ -151,7 +155,8 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
 	fi
 
 	if ! use qt5; then
diff --git a/www-client/opera-beta/opera-beta-108.0.5067.14.ebuild b/www-client/opera-beta/opera-beta-109.0.5097.24-r1.ebuild
index 4580a368fd6c..ad276bb735ac 100644
--- a/www-client/opera-beta/opera-beta-108.0.5067.14.ebuild
+++ b/www-client/opera-beta/opera-beta-109.0.5097.24-r1.ebuild
@@ -39,17 +39,17 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
 LICENSE="OPERA-2018"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -79,6 +79,10 @@ RDEPEND="
 	x11-libs/libXfixes
 	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} )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[X]
@@ -151,7 +155,8 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
 	fi
 
 	if ! use qt5; then
diff --git a/www-client/opera-beta/opera-beta-109.0.5097.24.ebuild b/www-client/opera-beta/opera-beta-109.0.5097.5-r1.ebuild
index 4580a368fd6c..ad276bb735ac 100644
--- a/www-client/opera-beta/opera-beta-109.0.5097.24.ebuild
+++ b/www-client/opera-beta/opera-beta-109.0.5097.5-r1.ebuild
@@ -39,17 +39,17 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
 LICENSE="OPERA-2018"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -79,6 +79,10 @@ RDEPEND="
 	x11-libs/libXfixes
 	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} )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[X]
@@ -151,7 +155,8 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
 	fi
 
 	if ! use qt5; then
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index ec2d77cb964a..27874da4224d 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,7 @@
 DIST opera-developer_109.0.5097.0_amd64.deb 115199092 BLAKE2B 3fc904daa984bd9732b01176ffb412ecf41d6557ff108689e9327c5ba6b062717f5205423d4d8fe86ad74385f31cc1209bb47bb32fd76b054686512b23d8a35a SHA512 131beba74262ea69f769563704482675248289cba82c400640d019891c356d94f94f8acb6901fb3a8fc6f571b36218dc12f65186d5dae78f45f18e3aa86d1db1
 DIST opera-developer_110.0.5104.0_amd64.deb 115270084 BLAKE2B 8af1ec0b96e3af184b6cd33e9b87632305c6eb8a318b795a6764cce6a4a5d6813ac6c7d73ea073a930fc6dc1fba53d5f71199f631509261a67fcaccd01f71922 SHA512 cd693e512b0b80e0f7a10f2894649e39bdeb26e0a572a2b8d1eb07c0745329229981fc72fe7c0b96f9f9cec48db354e56b9d23cba642b6872fa844bb3ecdeaa0
 DIST opera-developer_110.0.5111.0_amd64.deb 115386872 BLAKE2B 003a661b543fe13fc39a155d4d1d26af9e08158a65f64d5d6b99857dd6d0889b04bd8eb767fd83fc9fea200fd6f3f501d88602e974dcd04dd1c52fb84103b9ee SHA512 214798e9e5ba6c21c9f8893f29c5745d9315067b262ba6024442dc241bc05f67433c57b6005a2062767dce735142044e03ea290666dc611ba89ce5bb4041b251
-DIST opera-ffmpeg-codecs-114.0.5735.9.tar.xz 1315192 BLAKE2B ef9a0cfc8c30ac0a837863644f3c2d5e78059575e2b8f6fda9253304f4815a39d021602e802dac7e1d5a1685aa5015a02019c4a0399f0bdc81136f956cc1d55f SHA512 bdad66bd5d238bdeb81a4e2a956f0a814633360f05c7bed2161df9506d2ccc444445ba452cc8974c755fe0d3f46adceb90324a472a5dac72e9c65391ae7a841c
-EBUILD opera-developer-109.0.5097.0.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-EBUILD opera-developer-110.0.5104.0.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-EBUILD opera-developer-110.0.5111.0.ebuild 3798 BLAKE2B efba1b6b73f9bfe043227b573d5e2fda57a124140cf34e40da459be829cd5f32aed3ebcfdc672ad733c5e501292959f446862f0f7fd7fe595bcd8c8ced7a7d32 SHA512 233c3213175bff9ce242e051142c755045847fc0e6d85f708c53c1057a9f9a674844d07e4e8202de8e47de977395cb72d0f260fbca3840d43942b43dc09a41ef
-MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
+EBUILD opera-developer-109.0.5097.0-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+EBUILD opera-developer-110.0.5104.0-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+EBUILD opera-developer-110.0.5111.0-r1.ebuild 4223 BLAKE2B 7c23d2a54bb995bc94a36e3f9cb8c63e99047b6c57225415181fd0e25dbdac6fb028f0f8fcfc55b29c02ff2177769ef815f2fe197df9fcfaaf28ee58e5fcaa6c SHA512 862b44ab054d0b91373ebb2c0d44dd0bab4f7d6ac97effcd7b9f65f2b948044403274543f0e2b25ca00fdfb4c991d5fe80ec871e45c6b0faff2d962c0990f608
+MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-developer/metadata.xml b/www-client/opera-developer/metadata.xml
index b26bda26dc59..43f810908023 100644
--- a/www-client/opera-developer/metadata.xml
+++ b/www-client/opera-developer/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
 	<use>
+		<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">Enable codecs for patent-encumbered audio and video formats.</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/opera-beta/opera-beta-109.0.5097.5.ebuild b/www-client/opera-developer/opera-developer-109.0.5097.0-r1.ebuild
index 4580a368fd6c..ad276bb735ac 100644
--- a/www-client/opera-beta/opera-beta-109.0.5097.5.ebuild
+++ b/www-client/opera-developer/opera-developer-109.0.5097.0-r1.ebuild
@@ -39,17 +39,17 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
 LICENSE="OPERA-2018"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -79,6 +79,10 @@ RDEPEND="
 	x11-libs/libXfixes
 	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} )
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[X]
@@ -151,7 +155,8 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
 	fi
 
 	if ! use qt5; then
diff --git a/www-client/opera-developer/opera-developer-110.0.5104.0-r1.ebuild b/www-client/opera-developer/opera-developer-110.0.5104.0-r1.ebuild
new file mode 100644
index 000000000000..ad276bb735ac
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-110.0.5104.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	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} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# 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} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/opera-developer-110.0.5104.0.ebuild b/www-client/opera-developer/opera-developer-110.0.5104.0.ebuild
deleted file mode 100644
index 4580a368fd6c..000000000000
--- a/www-client/opera-developer/opera-developer-110.0.5104.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-110.0.5111.0-r1.ebuild b/www-client/opera-developer/opera-developer-110.0.5111.0-r1.ebuild
new file mode 100644
index 000000000000..ad276bb735ac
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-110.0.5111.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	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} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# 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} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/opera-developer-110.0.5111.0.ebuild b/www-client/opera-developer/opera-developer-110.0.5111.0.ebuild
deleted file mode 100644
index 4580a368fd6c..000000000000
--- a/www-client/opera-developer/opera-developer-110.0.5111.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 4e0976179264..9fc83071616d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,3 @@
-DIST opera-ffmpeg-codecs-114.0.5735.9.tar.xz 1315192 BLAKE2B ef9a0cfc8c30ac0a837863644f3c2d5e78059575e2b8f6fda9253304f4815a39d021602e802dac7e1d5a1685aa5015a02019c4a0399f0bdc81136f956cc1d55f SHA512 bdad66bd5d238bdeb81a4e2a956f0a814633360f05c7bed2161df9506d2ccc444445ba452cc8974c755fe0d3f46adceb90324a472a5dac72e9c65391ae7a841c
 DIST opera-stable_108.0.5067.29_amd64.deb 115339860 BLAKE2B 17b1ce49e2c6eadfe259e453fdf9e40726b61bc6aa9ae69d7f9226d004fd3de585c6d4bc54378d6dcef65654a601eed296835202ef2569de4c23d16d9f7ad0e6 SHA512 5e97f53aa87e70efa90ffd87c0a904b2e9b5410d39e1d0549b5018245ddddbb8cbc06ae7a322aa97643b3402bdc7f64fd8525e08a47f9a369396acf889f6727e
-EBUILD opera-108.0.5067.29.ebuild 3797 BLAKE2B b2bdd96061886c70b8604325553ec082ddec13db56d1dc95eb2f1a8ad1a5666ff2627efd9d69e6511e94eb63cace8dc340efdf4eb47b876144385432c0403a7c SHA512 2e10b80db77592a65097c16c8ff691fabac8fee3cae875fe2deb533fa2f26cbbe1a0cc425aff94e45487eb89824f6d96d428cfd56e15d401e3f5fb563b2df755
+EBUILD opera-108.0.5067.29-r1.ebuild 4084 BLAKE2B eea6ef582d8391625b48389d6a8ea8106f87efa00cc9103d63e3f100c74b3e80dd5b1a47870aeda59709dbde548866174ff8aa6e0799cedfb89220df98f05ff9 SHA512 31311b84a47225a0812b485e8b66a8c3ed67aa32f0b7319b485c45dc7218204141bc88d8598b4b6146b8a4d67c621f15524236165271862f3ffee03e14678e1b
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera/opera-108.0.5067.29.ebuild b/www-client/opera/opera-108.0.5067.29-r1.ebuild
index 67b029cadff1..a97bb25328be 100644
--- a/www-client/opera/opera-108.0.5067.29.ebuild
+++ b/www-client/opera/opera-108.0.5067.29-r1.ebuild
@@ -39,11 +39,11 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="114.0.5735.9"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="121"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
 LICENSE="OPERA-2018"
@@ -79,6 +79,9 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/pango
+	proprietary-codecs? (
+		media-video/ffmpeg-chromium:${CHROMIUM_VERSION}
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[X]
@@ -151,7 +154,8 @@ src_install() {
 	# install proprietary codecs
 	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
 	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${OPERA_HOME}/libffmpeg.so
 	fi
 
 	if ! use qt5; then