www-client/opera-developer: update ffmpeg, fix dependencies

Closes: https://bugs.gentoo.org/880037
Signed-off-by: Stephan Hartmann <sultan@gentoo.org>

4 files changed, 40 insertions, 22 deletions

diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 4362643fe6a1..145e0d25e808 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,4 +1,4 @@
 DIST opera-developer_95.0.4618.0_amd64.deb 99587420 BLAKE2B 10d13d6edfe3195b07facae22bee2454ef429305e35ea51d6360dc95c0139770415a0c762671340f6c283388cbb4be73a7360b81ada0f8f691fe7a99e6b1e036 SHA512 6334eb6c824a7ca119933a2695b3337290c70aa4a4a67e74b3376108cded7690e8969c7c83139f5dd02bb29b633b650304b6d7cf73afd9a441740031d75a8ca6
 DIST opera-developer_95.0.4625.0_amd64.deb 98610092 BLAKE2B 7146c756a23b12133c5c57dbe282ba47cc9fbbd4bdd6937b2c88d59d8fd9e76830a1f14c1dc093d4d047862756a85e4dcd8584e12230cae798cc0468bcd6da44 SHA512 d6c47ec5e1972781eedefcc5fc1aa5a0e65a4e2065b8de89d4388a9412f1f85df4b48dcadd181511d67891b9cb7537e1aad02eca936694a34ba6ee22bd4e908d
 DIST opera-developer_95.0.4632.0_amd64.deb 98941292 BLAKE2B 92ceb4005724e31586a15bbf8fa7232bcd7265d6e7fc16339d3dde2cb34110bc66d9fefe3f61d9b6d4ed366428b6b4c55e1b650a74d55b78fcc0bbc44f8795c1 SHA512 3c63e709b4b555b2d0ca9b68c43eef2d835150644536eed4619d9f8d1effb815d3aa391663ba2433206122440723931b7e23d7d2689bd0b199e10a5620840061
-DIST opera-ffmpeg-codecs-105.0.5195.19.tar.xz 1413912 BLAKE2B 52e951eb93b2ed91b4053002a43e79884c46aab7b2218a08717927e3f43bc247b340bafc18488fcf6596d4441c318d6fe734869c8daad047107aeff0fade4c71 SHA512 f29bc9146fa67b71fa2df83a9b731e9cb4ce7827a573b63fa1c10baba5980f0375cfab2c6e1edce01415753b6f3e0b65de7d361d9400550d7a2d637236e2e414
+DIST opera-ffmpeg-codecs-109.0.5414.25.tar.xz 1401956 BLAKE2B 51325a4fec2d71de3c99e58038548fd496ec6cf0882e52c4b81a63e7974dd4e1f547eaa60bb10b245b6399ed1a76be26982621d136eaa02591f08f93579ff62a SHA512 f39f11b80629856fda6cda754176f32a20f78d1b9a995254ffc77e994d40756b101d4fa945522acd672e1e7ed80d7ed1f0876240da1cff5c83b2628956b53367
diff --git a/www-client/opera-developer/opera-developer-95.0.4618.0.ebuild b/www-client/opera-developer/opera-developer-95.0.4618.0-r1.ebuild
index 861830ed07f3..4d1c6dc76dc6 100644
--- a/www-client/opera-developer/opera-developer-95.0.4618.0.ebuild
+++ b/www-client/opera-developer/opera-developer-95.0.4618.0-r1.ebuild
@@ -42,21 +42,18 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="109.0.5414.25"
 
 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
 	)"
 
-IUSE="+proprietary-codecs suid"
+IUSE="+proprietary-codecs +suid qt5"
 RESTRICT="bindist mirror strip"
 
 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
@@ -82,6 +79,11 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/pango
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -152,8 +154,12 @@ src_install() {
 		mv lib_extra "${OPERA_HOME}"
 	fi
 
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_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"
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
 }
diff --git a/www-client/opera-developer/opera-developer-95.0.4625.0.ebuild b/www-client/opera-developer/opera-developer-95.0.4625.0-r1.ebuild
index 861830ed07f3..4d1c6dc76dc6 100644
--- a/www-client/opera-developer/opera-developer-95.0.4625.0.ebuild
+++ b/www-client/opera-developer/opera-developer-95.0.4625.0-r1.ebuild
@@ -42,21 +42,18 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="109.0.5414.25"
 
 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
 	)"
 
-IUSE="+proprietary-codecs suid"
+IUSE="+proprietary-codecs +suid qt5"
 RESTRICT="bindist mirror strip"
 
 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
@@ -82,6 +79,11 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/pango
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -152,8 +154,12 @@ src_install() {
 		mv lib_extra "${OPERA_HOME}"
 	fi
 
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_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"
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
 }
diff --git a/www-client/opera-developer/opera-developer-95.0.4632.0.ebuild b/www-client/opera-developer/opera-developer-95.0.4632.0-r1.ebuild
index 861830ed07f3..4d1c6dc76dc6 100644
--- a/www-client/opera-developer/opera-developer-95.0.4632.0.ebuild
+++ b/www-client/opera-developer/opera-developer-95.0.4632.0-r1.ebuild
@@ -42,21 +42,18 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="109.0.5414.25"
 
 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
 	)"
 
-IUSE="+proprietary-codecs suid"
+IUSE="+proprietary-codecs +suid qt5"
 RESTRICT="bindist mirror strip"
 
 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
@@ -82,6 +79,11 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/pango
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
 "
 
 QA_PREBUILT="*"
@@ -152,8 +154,12 @@ src_install() {
 		mv lib_extra "${OPERA_HOME}"
 	fi
 
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_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"
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
 }