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

["Stephan Hartmann" <sultan@gentoo.org>]

commit:     bff7e0be9b099b2fbd2a9b7d07114f91bd22f6a6
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:43:28 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 17:43:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff7e0be

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

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

 www-client/opera-beta/Manifest                            |  2 +-
 ...0.4606.14.ebuild => opera-beta-94.0.4606.14-r1.ebuild} | 15 ++++++++++++---
 ...0.4606.19.ebuild => opera-beta-94.0.4606.19-r1.ebuild} | 15 ++++++++++++---
 ...4.0.4606.8.ebuild => opera-beta-94.0.4606.8-r1.ebuild} | 15 ++++++++++++---
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 87eee76c0376..9353eeb33b75 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
 DIST opera-beta_94.0.4606.14_amd64.deb 101475380 BLAKE2B 94a0eb0bf2c6018ec0d5e8a0eccd9c9ea494e88d0f50a200abe0d88855c697dedf4afe2da468208cb02fcfe5e028ff72debd0f54dcba9da4ada02fb4736b2fe8 SHA512 df4a67ff07b8b648035e299bafa30f7bcb5d428fa0473f4974d5b68825d8624f76d2041b87abec91269251ae1f683a6e2e0af17715d50d23e453616e03b574b7
 DIST opera-beta_94.0.4606.19_amd64.deb 101489260 BLAKE2B b1e083a85288417dcdeb552149471b5b1a7610f57ef7bed5f2f40333def96d03d024765f6aea070f14a4a0dcce5777b55f5bbda4f4c99b6ed8bcfa5227fca5f6 SHA512 4d400468103526ecb392ff7d55c18085c61913dcf2d77aa0a73c87965a7767ae7a640c06b14536be049768f32b167f427965b647af37d18e223b0b1133c711d5
 DIST opera-beta_94.0.4606.8_amd64.deb 101477468 BLAKE2B 63a5ae7c979df38332d29201bc765772a628aaa39f70205b52c6be03276d2b29d49c27f2b2be7da2a8a6d1a18448d9e932f569f5a5e902e5eea346357374b71e SHA512 bd65eac34f5b75450790ec6081a7589a05dd33b0934c518aed61508519133e54e824b22ea0e645a4ea0e451580cec2ce9d0f28ec46f68185a4d8efebe00e0e46
-DIST opera-ffmpeg-codecs-105.0.5195.19.tar.xz 1413912 BLAKE2B 52e951eb93b2ed91b4053002a43e79884c46aab7b2218a08717927e3f43bc247b340bafc18488fcf6596d4441c318d6fe734869c8daad047107aeff0fade4c71 SHA512 f29bc9146fa67b71fa2df83a9b731e9cb4ce7827a573b63fa1c10baba5980f0375cfab2c6e1edce01415753b6f3e0b65de7d361d9400550d7a2d637236e2e414
+DIST opera-ffmpeg-codecs-108.0.5359.125.tar.xz 1416300 BLAKE2B 9b4d3de10ae8c5efdf52a680829d1c7587dc23b79e39b1c456d8b747c56176b92952be792bc7fb1214c790bc571522630f83d66119a53e94ddb555b571bf1a35 SHA512 55eb35d5e9a1d859ec88cd87a03129e7ac12db7fd58480a0bd864903879529c15aa2f325bd495bad49029fa991824e3475c3f6b94b92a2896329a73261583452

diff --git a/www-client/opera-beta/opera-beta-94.0.4606.14.ebuild b/www-client/opera-beta/opera-beta-94.0.4606.14-r1.ebuild
similarity index 92%
rename from www-client/opera-beta/opera-beta-94.0.4606.14.ebuild
rename to www-client/opera-beta/opera-beta-94.0.4606.14-r1.ebuild
index b6382408cc0d..a0109cc78467 100644
--- a/www-client/opera-beta/opera-beta-94.0.4606.14.ebuild
+++ b/www-client/opera-beta/opera-beta-94.0.4606.14-r1.ebuild
@@ -42,14 +42,14 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="108.0.5359.125"
 
 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="
@@ -79,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="*"
@@ -149,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-beta/opera-beta-94.0.4606.19.ebuild b/www-client/opera-beta/opera-beta-94.0.4606.19-r1.ebuild
similarity index 92%
rename from www-client/opera-beta/opera-beta-94.0.4606.19.ebuild
rename to www-client/opera-beta/opera-beta-94.0.4606.19-r1.ebuild
index b6382408cc0d..a0109cc78467 100644
--- a/www-client/opera-beta/opera-beta-94.0.4606.19.ebuild
+++ b/www-client/opera-beta/opera-beta-94.0.4606.19-r1.ebuild
@@ -42,14 +42,14 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="108.0.5359.125"
 
 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="
@@ -79,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="*"
@@ -149,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-beta/opera-beta-94.0.4606.8.ebuild b/www-client/opera-beta/opera-beta-94.0.4606.8-r1.ebuild
similarity index 92%
rename from www-client/opera-beta/opera-beta-94.0.4606.8.ebuild
rename to www-client/opera-beta/opera-beta-94.0.4606.8-r1.ebuild
index b6382408cc0d..a0109cc78467 100644
--- a/www-client/opera-beta/opera-beta-94.0.4606.8.ebuild
+++ b/www-client/opera-beta/opera-beta-94.0.4606.8-r1.ebuild
@@ -42,14 +42,14 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="105.0.5195.19"
+FFMPEG_VERSION="108.0.5359.125"
 
 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="
@@ -79,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="*"
@@ -149,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"
 }