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

[James Le Cuirot]

commit:     3dad3b85e0ddadda97bf6537becfb7de2b9d4927
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 20:58:29 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 21:00:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dad3b85

www-client/vivaldi-snapshot: Qt6 support, remove amd64-only binary

Closes: https://bugs.gentoo.org/928520
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../vivaldi-snapshot/vivaldi-snapshot-6.6.3291.3.ebuild     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3291.3.ebuild 
b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3291.3.ebuild
index 9304611c3c84..10a7c0c7da3c 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3291.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3291.3.ebuild
@@ -85,7 +85,7 @@ CHROMIUM_LANGS="
        zh-TW
 "
 
-inherit chromium-2 desktop linux-info unpacker xdg
+inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 
 VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
 VIVALDI_HOME="opt/${PN}"
@@ -109,7 +109,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 widevine"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
 
@@ -144,6 +144,7 @@ RDEPEND="
                dev-qt/qtgui:5
                dev-qt/qtwidgets:5
        )
+       qt6? ( dev-qt/qtbase:6[gui,widgets] )
        widevine? ( www-plugins/chrome-binary-plugins )
 "
 
@@ -178,6 +179,7 @@ src_prepare() {
        popd > /dev/null || die
 
        if use proprietary-codecs; then
+               einfo Bundled $($(tc-getSTRINGS) 
${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
                rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
                rmdir ${VIVALDI_HOME}/lib || die
        fi
@@ -186,10 +188,15 @@ src_prepare() {
                rm ${VIVALDI_HOME}/libqt5_shim.so || die
        fi
 
-       if ! false; then # use qt6; then (TODO)
+       if ! use qt6; then
                rm ${VIVALDI_HOME}/libqt6_shim.so || die
        fi
 
+       # Bug #928519, #928520.
+       if ! use amd64; then
+               rm ${VIVALDI_HOME}/relayproxy-linux || die
+       fi
+
        eapply_user
 }