gentoo auto-resync : 02:01:2025 - 06:31:11

13 files changed, 605 insertions, 326 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2849786e310e..562ae36091ff 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 3dde4c738e95..be81dee7b09e 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,5 +1,5 @@
 DIST slack-desktop-4.41.104-amd64.deb 81819034 BLAKE2B 883995514e7356ca617ef0f69449d034ca06e9539b83e285922f975506de4edc1fa5b1527d8718c43ce1f4817983d4dc724f5b97657d19b287a153de9bddcb05 SHA512 b5a6a418831a9fb825f96b58486777f8070c3330bd24953029145de585a27535fdc46db0b958c8fb5f98d705a9be7a274ce0d4f5de8b56602b550e8cdce6c0e6
-DIST slack-desktop-4.41.97-amd64.deb 81818486 BLAKE2B 7b1c8fa9cd868ae85ea639398ee3f13a8cecb2b9b86e30491cef256850ba092b26a6a824f936db616c54f1420e4845c30a1ccfe9ae9380bf161b0fafb3571987 SHA512 17ce3d24d03aebfb31a8dbfa9055d475eb8faf3c0b74edb60e27f839e10f88df24bd7c00de6a3838267b0c2e0021bfda686c3f467d1d459e8f98554bfb3a4b10
+DIST slack-desktop-4.41.105-amd64.deb 81830758 BLAKE2B 2c2a86db4d2b0c8c0e108b5dabbc52eeba5c8faa64f2dd5420410215f6c4266a74a08c0d76b7f529d0dce62e1927f883fdb893e710d79e5743d742c1fff3ab26 SHA512 c3c6ec23a0337f234ee21526421ae19e834b87677b5df2a5243db59d0d8ee966c3b0c8a15e6a2a3bf21f2fe3553aa749328130eceeaca0c688a46c9296d7ce34
 EBUILD slack-4.41.104.ebuild 3393 BLAKE2B 0b4bf31520edb1bda734a2f6e63dbed6ac5d356e92e0354d3209fe82f188c44aac8b03e67d2ef20394295cfc1329855becd56511066892627a4ee7c7c8b6beca SHA512 7497c4169942fe6695ef510c10222242c2bd2529087436bce69d4be41f9606b61fd74330c2fd24618ef8d72f5c60110860b95cf658d195a43199895f26f3d4fa
-EBUILD slack-4.41.97.ebuild 3393 BLAKE2B 0b4bf31520edb1bda734a2f6e63dbed6ac5d356e92e0354d3209fe82f188c44aac8b03e67d2ef20394295cfc1329855becd56511066892627a4ee7c7c8b6beca SHA512 7497c4169942fe6695ef510c10222242c2bd2529087436bce69d4be41f9606b61fd74330c2fd24618ef8d72f5c60110860b95cf658d195a43199895f26f3d4fa
+EBUILD slack-4.41.105.ebuild 3393 BLAKE2B ea95d6f921972cab07af47a68f7d073eb40624c8d609b1e4b7288c705925acbf22dd4878343882e8665dc87e519be395296797b407bfb28a5f06928b38496ea6 SHA512 af5a15a00f06b97a6de9079732cca439b72d78d451a8f2003a426bb5d691d74794f343ffb57a9ef5e9e57c3cc0c83c267df5d2791b74fca13b38f09343854bed
 MISC metadata.xml 820 BLAKE2B fbc57502a8a3fd4d5d3c8df0cc4e51b97f2349704fe3d2f53dc1933eb7ea5ddc5579a0cacea547581933a0f24ace33ea003921566e4d71ed275a1058ca80562a SHA512 776c49eef270ac6c837a73b3e2aec3aedf7613af20e37da7c91b8c482d5b957c5a0e66baf28ebc3a1bf0ff70afa46688c6f360a47123905af7537dc1a1a6e0e9
diff --git a/net-im/slack/slack-4.41.97.ebuild b/net-im/slack/slack-4.41.105.ebuild
index 1df68b31ba00..ef4dec4f3057 100644
--- a/net-im/slack/slack-4.41.97.ebuild
+++ b/net-im/slack/slack-4.41.105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest
index a67474a01941..b55be8440849 100644
--- a/net-im/whatsie/Manifest
+++ b/net-im/whatsie/Manifest
@@ -1,5 +1,5 @@
-DIST whatsie-4.16.2.tar.gz 21404051 BLAKE2B e1f80ffec1c13a998828769601b529caa7837a6928a090c80cd1f14947a61fa21ba6270c8299bc7e2cd1c9ba12bbbd7b00c6114b3b56e588b2e88b1b2af4c13d SHA512 317f6388521bfad58b726d033fd58e376db5a77ff1c24d3d484a461eb2e9e8fd5c318e96f5083b423104ae08da1270af4717263236f6944204845b11cff6a5c9
+AUX whatsie-4.16.3-qt6.patch 18650 BLAKE2B a4ee93a3aa4806902b0ae98623741699a862defb712d233fa5b08a5286de995435de7cade57595e1bfffb3e4417551da62dad2161d34017eda38f2ca11c35648 SHA512 b7b099759131d99a579922a60a1810619541013e6e034725844b7d77d8c7f96545ecf8d4f5b8142b4a7881cfa1e20aaf35b126e921463adbdbf3bcf8699d2ae9
+AUX whatsie-4.16.3-respect-user-flags.patch 729 BLAKE2B c743549b109e0af65393674e7af2342fe6d468731804189503c1f0580435d731942aac77138892975c8c54d045d6277f25308315473bde4696cc25d8b15a1978 SHA512 522758bdc32f1945a4cfa532178c822b367158c267052cc61e8f1436122e26d41401d23c101ec0a23aefa8e68b2231fc9ebbbe2d1bacba5e1590d155f2574acb
 DIST whatsie-4.16.3.tar.gz 21405138 BLAKE2B d9038e74b221b8f9caa62eb527bb4ea3b0328d89a79dd2d876aa19e876e192c9df266349d73e673bee9c71c22f1a46aa57273474dcba461b7ae0926ae36e923e SHA512 db14995718b639e1e3aba7b965958bb17cf5244eb1a81ea628b6c10a5cf751b38731a8861fcaf3a50bb5ca64e50e4e58869e5a91279ec2d2bff88debe1e64fa1
-EBUILD whatsie-4.16.2.ebuild 772 BLAKE2B a8473146e82a61ad8c60eedad47f58e6ec9ed3de95c6e68b718f33d27fe49b4680e5fa9db3f8b6626741a1ec6438868926d15d17dddff6bb2f5412dca623f0a9 SHA512 7f9b4c32806b0d2d8e7609db56701854e0f5cf2e5a79961b5b09bd0bde5afe85d0af5344f3b0594f71bb37550d39c92fbe88b4709614b3f2fb372c6f042019c9
-EBUILD whatsie-4.16.3.ebuild 772 BLAKE2B a8473146e82a61ad8c60eedad47f58e6ec9ed3de95c6e68b718f33d27fe49b4680e5fa9db3f8b6626741a1ec6438868926d15d17dddff6bb2f5412dca623f0a9 SHA512 7f9b4c32806b0d2d8e7609db56701854e0f5cf2e5a79961b5b09bd0bde5afe85d0af5344f3b0594f71bb37550d39c92fbe88b4709614b3f2fb372c6f042019c9
+EBUILD whatsie-4.16.3-r1.ebuild 1091 BLAKE2B 7cbc2558651fa20f8ea410abda9acf3b34d466a59a991d90e07724f96e7dbe97b16f45802c599bac2bc0be417999b5357e02add467ea9bc3a971e79544f720d0 SHA512 0d10a461e8d46ed1ef12bd8d0a1cfe30996e4ed3b39bc2ea6719ba190f1d0e9540cfd75768dc9cd47235283bc1f2f5085e0abd11add21d71e731e3bc4dac021b
 MISC metadata.xml 330 BLAKE2B 5f85994945f3f1df6c2bafcc06e616ab0f6c901ff966cde895d07cb00f72fb552c85931a5a4730f7ce9e4630783d3974a9e909437f81f55088fbee523d7dbf19 SHA512 2ad99337544ace5c84199c95d88297c94a857e995e6f26c4ae98d80bac89fc0af790e6513d6bf6b8dc471bc772462628a98cbf3f3983154446dfb843729e34ad
diff --git a/net-im/whatsie/files/whatsie-4.16.3-qt6.patch b/net-im/whatsie/files/whatsie-4.16.3-qt6.patch
new file mode 100644
index 000000000000..d441418823c7
--- /dev/null
+++ b/net-im/whatsie/files/whatsie-4.16.3-qt6.patch
@@ -0,0 +1,500 @@
+https://github.com/keshavbhatt/whatsie/pull/209
+diff --git a/WhatsApp.pro b/WhatsApp.pro
+index 881963a..5d5ed16 100644
+--- a/WhatsApp.pro
++++ b/WhatsApp.pro
+@@ -23,7 +23,9 @@ equals(QMAKE_HOST.arch, aarch64) {
+ # Uncomment if you need specific linker flags as well
+ #QMAKE_LFLAGS += $$QMAKE_LDFLAGS
+ 
+-QT += core gui webengine webenginewidgets positioning
++QT += core gui webenginewidgets positioning
++
++lessThan(QT_MAJOR_VERSION, 6): QT += webengine
+ 
+ CONFIG += c++17
+ 
+diff --git a/automatictheme.cpp b/automatictheme.cpp
+index 9b1f3e7..a4d9fc5 100644
+--- a/automatictheme.cpp
++++ b/automatictheme.cpp
+@@ -47,7 +47,11 @@ AutomaticTheme::AutomaticTheme(QWidget *parent)
+                 ui->refresh->setEnabled(false);
+               }
+             });
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++    connect(m_gPosInfoSrc, &QGeoPositionInfoSource::errorOccurred, this, [=]() {
++#else
+     connect(m_gPosInfoSrc, &QGeoPositionInfoSource::updateTimeout, this, [=]() {
++#endif
+       if (!SettingsManager::instance().settings().value("sunrise").isValid() ||
+           !SettingsManager::instance().settings().value("sunset").isValid()) {
+         if (ui->refresh->isEnabled())
+@@ -77,9 +81,9 @@ void AutomaticTheme::on_refresh_clicked() {
+   if (geoCor.isValid()) {
+     Sunclock sun(this->m_latitube, this->m_longitude, this->m_hourOffset);
+     m_sunrise.setSecsSinceEpoch(
+-        sun.sunrise(QDateTime::currentDateTimeUtc().toTime_t()));
++        sun.sunrise(QDateTime::currentDateTimeUtc().toSecsSinceEpoch()));
+     m_sunset.setSecsSinceEpoch(
+-        sun.sunset(QDateTime::currentDateTimeUtc().toTime_t()));
++        sun.sunset(QDateTime::currentDateTimeUtc().toSecsSinceEpoch()));
+ 
+     ui->sunrise->setTime(m_sunrise.time());
+     ui->sunset->setTime(m_sunset.time());
+diff --git a/downloadmanagerwidget.h b/downloadmanagerwidget.h
+index 8367041..b5b88cb 100644
+--- a/downloadmanagerwidget.h
++++ b/downloadmanagerwidget.h
+@@ -57,12 +57,14 @@
+ 
+ #include <QFileDialog>
+ #include <QStandardPaths>
+-#include <QWebEngineDownloadItem>
+ #include <QWidget>
+ 
+-QT_BEGIN_NAMESPACE
+-class QWebEngineDownloadItem;
+-QT_END_NAMESPACE
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++#include <QWebEngineDownloadRequest>
++using QWebEngineDownloadItem = QWebEngineDownloadRequest;
++#else
++#include <QWebEngineDownloadItem>
++#endif
+ 
+ class DownloadWidget;
+ 
+diff --git a/downloadwidget.cpp b/downloadwidget.cpp
+index bdc974d..82e555a 100644
+--- a/downloadwidget.cpp
++++ b/downloadwidget.cpp
+@@ -4,7 +4,6 @@
+ #include <QDesktopServices>
+ #include <QFileInfo>
+ #include <QUrl>
+-#include <QWebEngineDownloadItem>
+ 
+ DownloadWidget::DownloadWidget(QWebEngineDownloadItem *download,
+                                QWidget *parent)
+@@ -38,8 +37,15 @@ DownloadWidget::DownloadWidget(QWebEngineDownloadItem *download,
+       emit removeClicked(this);
+   });
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  connect(m_download, &QWebEngineDownloadItem::receivedBytesChanged, this,
++          &DownloadWidget::updateWidget);
++  connect(m_download, &QWebEngineDownloadItem::totalBytesChanged, this,
++          &DownloadWidget::updateWidget);
++#else
+   connect(m_download, &QWebEngineDownloadItem::downloadProgress, this,
+           &DownloadWidget::updateWidget);
++#endif
+ 
+   connect(m_download, &QWebEngineDownloadItem::stateChanged, this,
+           &DownloadWidget::updateWidget);
+diff --git a/downloadwidget.h b/downloadwidget.h
+index 4417cb4..9607fac 100644
+--- a/downloadwidget.h
++++ b/downloadwidget.h
+@@ -58,9 +58,12 @@
+ #include <QFrame>
+ #include <QTime>
+ 
+-QT_BEGIN_NAMESPACE
+-class QWebEngineDownloadItem;
+-QT_END_NAMESPACE
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++#include <QWebEngineDownloadRequest>
++using QWebEngineDownloadItem = QWebEngineDownloadRequest;
++#else
++#include <QWebEngineDownloadItem>
++#endif
+ 
+ // Displays one ongoing or finished download (QWebEngineDownloadItem).
+ class DownloadWidget final : public QFrame, public Ui::DownloadWidget {
+diff --git a/main.cpp b/main.cpp
+index 1d5efe9..65bfd7d 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -2,9 +2,14 @@
+ #include <QDebug>
+ #include <QWebEngineProfile>
+ #include <QWebEngineSettings>
+-#include <QtWebEngine>
+ #include <QtWidgets>
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++#include <QtWebEngineCore>
++#else
++#include <QtWebEngine>
++#endif
++
+ #include "common.h"
+ #include "def.h"
+ #include "mainwindow.h"
+@@ -13,7 +18,9 @@
+ 
+ int main(int argc, char *argv[]) {
+ 
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+   QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
++#endif
+ 
+ #ifdef QT_DEBUG
+   qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
+@@ -136,12 +143,10 @@ int main(int argc, char *argv[]) {
+     return 0;
+   }
+ 
+-  QWebEngineSettings::defaultSettings()->setAttribute(
+-      QWebEngineSettings::DnsPrefetchEnabled, true);
+-  QWebEngineSettings::defaultSettings()->setAttribute(
+-      QWebEngineSettings::FullScreenSupportEnabled, true);
+-  QWebEngineSettings::defaultSettings()->setAttribute(
+-      QWebEngineSettings::JavascriptCanAccessClipboard, true);
++  QWebEngineSettings *websettings = QWebEngineProfile::defaultProfile()->settings();
++  websettings->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true);
++  websettings->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true);
++  websettings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, true);
+ 
+   MainWindow whatsie;
+ 
+@@ -153,7 +158,7 @@ int main(int argc, char *argv[]) {
+         qInfo().noquote() << "Another instance with PID: " +
+                                  QString::number(instanceId) +
+                                  ", sent argument: " + message;
+-        QString messageStr = QTextCodec::codecForMib(106)->toUnicode(message);
++        QString messageStr = QString::fromUtf8(message);
+ 
+         QCommandLineParser p;
+         p.addOptions(secondaryInstanceCLIOptions);
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 94dc414..ba66fcd 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -43,7 +43,7 @@ void MainWindow::restoreMainWindow() {
+         SettingsManager::instance().settings().value("geometry").toByteArray());
+     QPoint pos = QCursor::pos();
+     auto localScreens = QGuiApplication::screens();
+-    for (auto screen : qAsConst(localScreens)) {
++    for (auto screen : std::as_const(localScreens)) {
+       QRect screenRect = screen->geometry();
+       if (screenRect.contains(pos)) {
+         this->move(screenRect.center() - this->rect().center());
+@@ -244,7 +244,7 @@ void MainWindow::tryLogOut() {
+ }
+ 
+ void MainWindow::initSettingWidget() {
+-  int screenNumber = qApp->desktop()->screenNumber(this);
++  int screenNumber = qApp->screens().indexOf(screen());
+   if (m_settingsWidget == nullptr) {
+     m_settingsWidget = new SettingsWidget(
+         this, screenNumber, m_webEngine->page()->profile()->cachePath(),
+@@ -451,8 +451,7 @@ void MainWindow::showSettings(bool isAskedByCLI) {
+   if (!m_settingsWidget->isVisible()) {
+     this->updateSettingsUserAgentWidget();
+     m_settingsWidget->refresh();
+-    int screenNumber = qApp->desktop()->screenNumber(this);
+-    QRect screenRect = QGuiApplication::screens().at(screenNumber)->geometry();
++    QRect screenRect = screen()->geometry();
+     if (!screenRect.contains(m_settingsWidget->pos())) {
+       m_settingsWidget->move(screenRect.center() -
+                              m_settingsWidget->rect().center());
+@@ -579,7 +578,7 @@ void MainWindow::notificationClicked() {
+ void MainWindow::createActions() {
+ 
+   m_openUrlAction = new QAction("New Chat", this);
+-  m_openUrlAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_N));
++  m_openUrlAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_N));
+   connect(m_openUrlAction, &QAction::triggered, this, &MainWindow::newChat);
+   addAction(m_openUrlAction);
+ 
+@@ -594,7 +593,7 @@ void MainWindow::createActions() {
+   addAction(m_minimizeAction);
+ 
+   QShortcut *minimizeShortcut = new QShortcut(
+-      QKeySequence(Qt::Modifier::CTRL + Qt::Key_W), this, SLOT(hide()));
++      QKeySequence(Qt::Modifier::CTRL | Qt::Key_W), this, SLOT(hide()));
+   minimizeShortcut->setAutoRepeat(false);
+ 
+   m_restoreAction = new QAction(tr("&Restore"), this);
+@@ -608,19 +607,19 @@ void MainWindow::createActions() {
+   addAction(m_reloadAction);
+ 
+   m_lockAction = new QAction(tr("Loc&k"), this);
+-  m_lockAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_L));
++  m_lockAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_L));
+   connect(m_lockAction, &QAction::triggered, this, &MainWindow::lockApp);
+   addAction(m_lockAction);
+ 
+   m_settingsAction = new QAction(tr("&Settings"), this);
+-  m_settingsAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_P));
++  m_settingsAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_P));
+   connect(m_settingsAction, &QAction::triggered, this,
+           &MainWindow::showSettings);
+   addAction(m_settingsAction);
+ 
+   m_toggleThemeAction = new QAction(tr("&Toggle theme"), this);
+   m_toggleThemeAction->setShortcut(
+-      QKeySequence(Qt::Modifier::CTRL + Qt::Key_T));
++      QKeySequence(Qt::Modifier::CTRL | Qt::Key_T));
+   connect(m_toggleThemeAction, &QAction::triggered, this,
+           &MainWindow::toggleTheme);
+   addAction(m_toggleThemeAction);
+@@ -629,7 +628,7 @@ void MainWindow::createActions() {
+   connect(m_aboutAction, &QAction::triggered, this, &MainWindow::showAbout);
+ 
+   m_quitAction = new QAction(tr("&Quit"), this);
+-  m_quitAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_Q));
++  m_quitAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_Q));
+   connect(m_quitAction, &QAction::triggered, this, &MainWindow::quitApp);
+   addAction(m_quitAction);
+ }
+diff --git a/mainwindow.h b/mainwindow.h
+index 7be6372..0603890 100644
+--- a/mainwindow.h
++++ b/mainwindow.h
+@@ -15,7 +15,6 @@
+ #include <QStyle>
+ #include <QStyleFactory>
+ #include <QSystemTrayIcon>
+-#include <QWebEngineContextMenuData>
+ #include <QWebEngineCookieStore>
+ #include <QWebEngineFullScreenRequest>
+ #include <QWebEngineProfile>
+diff --git a/notificationpopup.h b/notificationpopup.h
+index dc1277b..c9b2a54 100644
+--- a/notificationpopup.h
++++ b/notificationpopup.h
+@@ -6,14 +6,12 @@
+ 
+ #include <QApplication>
+ #include <QDebug>
+-#include <QDesktopWidget>
+ #include <QHBoxLayout>
+ #include <QLabel>
+ #include <QMouseEvent>
+ #include <QPropertyAnimation>
+ #include <QPushButton>
+ #include <QScreen>
+-#include <QScreen>
+ #include <QSpacerItem>
+ #include <QTimer>
+ #include <QVBoxLayout>
+@@ -131,13 +129,11 @@ protected slots:
+   }
+ 
+   void onClosed() {
+-    auto x = this->pos().x();
+-    auto y = this->pos().y();
++    auto pos = mapToGlobal(QPoint(0, 0));
+     QPropertyAnimation *a = new QPropertyAnimation(this, "pos");
+     a->setDuration(150);
+-    a->setStartValue(QApplication::desktop()->mapToGlobal(QPoint(x, y)));
+-    a->setEndValue(QApplication::desktop()->mapToGlobal(
+-        QPoint(x, -(this->height() + 20))));
++    a->setStartValue(pos);
++    a->setEndValue(QPoint(pos.x(), -(this->height() + 20)));
+     a->setEasingCurve(QEasingCurve::Linear);
+ 
+     connect(a, &QPropertyAnimation::finished, this, [=]() {
+diff --git a/utils.cpp b/utils.cpp
+index a2ebc00..e1b39f4 100644
+--- a/utils.cpp
++++ b/utils.cpp
+@@ -134,7 +134,7 @@ QString Utils::convertSectoDay(qint64 secs) {
+ QString
+ Utils::returnPath(QString pathname,
+                   QString standardLocation = QStandardPaths::writableLocation(
+-                      QStandardPaths::DataLocation)) {
++                      QStandardPaths::AppLocalDataLocation)) {
+   QChar sepe = QDir::separator();
+   QDir d(standardLocation + sepe + pathname);
+   d.mkpath(standardLocation + sepe + pathname);
+diff --git a/webenginepage.cpp b/webenginepage.cpp
+index daa33f3..fca21f8 100644
+--- a/webenginepage.cpp
++++ b/webenginepage.cpp
+@@ -26,6 +26,11 @@ WebEnginePage::WebEnginePage(QWebEngineProfile *profile, QObject *parent)
+   connect(this, &QWebEnginePage::selectClientCertificate, this,
+           &WebEnginePage::handleSelectClientCertificate);
+ #endif
++
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  connect(this, &QWebEnginePage::certificateError, this,
++          &WebEnginePage::handleCertificateError);
++#endif
+ }
+ 
+ bool WebEnginePage::acceptNavigationRequest(const QUrl &url,
+@@ -196,7 +201,13 @@ QStringList WebEnginePage::chooseFiles(QWebEnginePage::FileSelectionMode mode,
+   return selectedFiles;
+ }
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++void WebEnginePage::handleCertificateError(const QWebEngineCertificateError &error) {
++  QString description = error.description();
++#else
+ bool WebEnginePage::certificateError(const QWebEngineCertificateError &error) {
++  QString description = error.errorDescription();
++#endif
+   QWidget *mainWindow = view()->window();
+   if (error.isOverridable()) {
+     QDialog dialog(mainWindow);
+@@ -209,14 +220,26 @@ bool WebEnginePage::certificateError(const QWebEngineCertificateError &error) {
+     QIcon icon(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxWarning,
+                                                  nullptr, mainWindow));
+     certificateDialog.m_iconLabel->setPixmap(icon.pixmap(32, 32));
+-    certificateDialog.m_errorLabel->setText(error.errorDescription());
++    certificateDialog.m_errorLabel->setText(description);
+     dialog.setWindowTitle(tr("Certificate Error"));
+-    return dialog.exec() == QDialog::Accepted;
++    bool accepted = dialog.exec() == QDialog::Accepted;
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++    auto handler = const_cast<QWebEngineCertificateError&>(error);
++    if (accepted)
++        handler.acceptCertificate();
++    else
++        handler.rejectCertificate();
++#else
++    return accepted;
++#endif
+   }
+ 
+   QMessageBox::critical(mainWindow, tr("Certificate Error"),
+-                        error.errorDescription());
++                        description);
++
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+   return false;
++#endif
+ }
+ 
+ void WebEnginePage::handleAuthenticationRequired(const QUrl &requestUrl,
+diff --git a/webenginepage.h b/webenginepage.h
+index f9d8324..92eb8df 100644
+--- a/webenginepage.h
++++ b/webenginepage.h
+@@ -16,6 +16,10 @@
+ #include <QWebEngineRegisterProtocolHandlerRequest>
+ #include <QWebEngineSettings>
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++#include <QWebEngineView>
++#endif
++
+ #include "settingsmanager.h"
+ 
+ #include "ui_certificateerrordialog.h"
+@@ -32,10 +36,21 @@ class WebEnginePage : public QWebEnginePage {
+                                QWebEnginePage::NavigationType type,
+                                bool isMainFrame) override;
+   QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override;
+-  bool certificateError(const QWebEngineCertificateError &error) override;
+   QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles,
+                           const QStringList &acceptedMimeTypes) override;
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  void handleCertificateError(const QWebEngineCertificateError &error);
++#else
++  bool certificateError(const QWebEngineCertificateError &error) override;
++#endif
++
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  inline QWidget *view() {
++      return QWebEngineView::forPage(this);
++  }
++#endif
++
+ public slots:
+   void handleFeaturePermissionRequested(const QUrl &securityOrigin,
+                                         QWebEnginePage::Feature feature);
+diff --git a/webview.cpp b/webview.cpp
+index 035fb4b..07e0605 100644
+--- a/webview.cpp
++++ b/webview.cpp
+@@ -2,10 +2,16 @@
+ 
+ #include <QContextMenuEvent>
+ #include <QMenu>
+-#include <QWebEngineContextMenuData>
+ #include <QWebEngineProfile>
+ #include <mainwindow.h>
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++#include <QWebEngineContextMenuRequest>
++using QWebEngineContextMenuData = QWebEngineContextMenuRequest;
++#else
++#include <QWebEngineContextMenuData>
++#endif
++
+ WebView::WebView(QWidget *parent, QStringList dictionaries)
+     : QWebEngineView(parent), m_dictionaries(dictionaries) {
+ 
+@@ -63,8 +69,11 @@ void WebView::wheelEvent(QWheelEvent *event) {
+ }
+ 
+ void WebView::contextMenuEvent(QContextMenuEvent *event) {
+-
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  auto menu = createStandardContextMenu();
++#else
+   auto menu = page()->createStandardContextMenu();
++#endif
+   menu->setAttribute(Qt::WA_DeleteOnClose, true);
+   // hide reload, back, forward, savepage, copyimagelink menus
+   foreach (auto *action, menu->actions()) {
+@@ -77,8 +86,12 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) {
+     }
+   }
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++  const QWebEngineContextMenuRequest &data = *lastContextMenuRequest();
++#else
+   const QWebEngineContextMenuData &data = page()->contextMenuData();
+   Q_ASSERT(data.isValid());
++#endif
+ 
+   // allow context menu on image
+   if (data.mediaType() == QWebEngineContextMenuData::MediaTypeImage) {
+@@ -107,7 +120,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) {
+ 
+   if (pageWebengineProfile->isSpellCheckEnabled()) {
+     auto subMenu = menu->addMenu(tr("Select Language"));
+-    for (const QString &dict : qAsConst(m_dictionaries)) {
++    for (const QString &dict : std::as_const(m_dictionaries)) {
+       auto action = subMenu->addAction(dict);
+       action->setCheckable(true);
+       action->setChecked(languages.contains(dict));
+diff --git a/widgets/MoreApps/moreapps.cpp b/widgets/MoreApps/moreapps.cpp
+index c333751..a32ae9e 100644
+--- a/widgets/MoreApps/moreapps.cpp
++++ b/widgets/MoreApps/moreapps.cpp
+@@ -104,7 +104,7 @@ QList<AppItem> MoreApps::prepareAppsToShow(const QByteArray &bytes) {
+   }
+ 
+   QJsonArray jsonArray = jsonResponse.object().value("results").toArray();
+-  foreach (const QJsonValue &val, jsonArray) {
++  for (const QJsonValue &val : jsonArray) {
+     QJsonObject object = val.toObject();
+ 
+     // publisher
+@@ -127,7 +127,7 @@ QList<AppItem> MoreApps::prepareAppsToShow(const QByteArray &bytes) {
+     QJsonArray mediaArr =
+         object.value("snap").toObject().value("media").toArray();
+     QString iconUrl;
+-    foreach (const QJsonValue &mediaItem, mediaArr) {
++    for (const QJsonValue &mediaItem : mediaArr) {
+       if (mediaItem.toObject().value("type") == "icon")
+         iconUrl = mediaItem.toObject().value("url").toString();
+     }
+@@ -252,7 +252,7 @@ void MoreApps::showApps() {
+   if (mRemoteIconPreCaching) {
+     // cache fallback icon
+     setRemoteIcon(fallbackIconUrl, nullptr);
+-    foreach (auto a, mAppList) {
++    for (auto &a : mAppList) {
+       auto iconUrl = a.getIconUrl();
+       // qDebug() << "pre-caching icon for" << a.getName();
+       setRemoteIcon(iconUrl, nullptr);
diff --git a/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch b/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch
new file mode 100644
index 000000000000..e1d91caee946
--- /dev/null
+++ b/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch
@@ -0,0 +1,27 @@
+diff --git a/WhatsApp.pro b/WhatsApp.pro
+index 38995b7..fbc572a 100644
+--- a/WhatsApp.pro
++++ b/WhatsApp.pro
+@@ -4,22 +4,6 @@
+ #
+ #-------------------------------------------------
+ 
+-# Common security flags for all architectures
+-QMAKE_CFLAGS += -fstack-protector-strong -fstack-clash-protection -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS
+-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+-
+-# Optimization flags
+-QMAKE_CFLAGS_RELEASE += -O2
+-QMAKE_CXXFLAGS_RELEASE += -O2
+-
+-QMAKE_CFLAGS_DEBUG += -O1
+-QMAKE_CXXFLAGS_DEBUG += -O1
+-
+-# Architecture-specific flags
+-equals(QMAKE_HOST.arch, aarch64) {
+-    QMAKE_CFLAGS += -mbranch-protection=standard
+-}
+-
+ # Uncomment if you need specific linker flags as well
+ #QMAKE_LFLAGS += $$QMAKE_LDFLAGS
+ 
diff --git a/net-im/whatsie/whatsie-4.16.2.ebuild b/net-im/whatsie/whatsie-4.16.2.ebuild
deleted file mode 100644
index 8919b85b6d47..000000000000
--- a/net-im/whatsie/whatsie-4.16.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt Based WhatsApp Client"
-HOMEPAGE="https://github.com/keshavbhatt/whatsie"
-SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-QT_MIN="5.15"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	>=dev-qt/qtcore-${QT_MIN}:5
-	>=dev-qt/qtgui-${QT_MIN}:5
-	>=dev-qt/qtnetwork-${QT_MIN}:5
-	>=dev-qt/qtpositioning-${QT_MIN}:5
-	>=dev-qt/qtwebengine-${QT_MIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QT_MIN}:5
-"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-	INSTALL_ROOT="${ED}" emake install
-}
diff --git a/net-im/whatsie/whatsie-4.16.3-r1.ebuild b/net-im/whatsie/whatsie-4.16.3-r1.ebuild
new file mode 100644
index 000000000000..2c47de94791b
--- /dev/null
+++ b/net-im/whatsie/whatsie-4.16.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix qmake-utils xdg
+
+DESCRIPTION="Qt Based WhatsApp Client"
+HOMEPAGE="https://github.com/keshavbhatt/whatsie"
+SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QT_MIN="6.0.0"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	>=dev-qt/qtbase-${QT_MIN}:6[gui,network,widgets]
+	>=dev-qt/qtpositioning-${QT_MIN}:6
+	>=dev-qt/qtwebengine-${QT_MIN}:6[widgets]
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16.3-qt6.patch"
+	"${FILESDIR}/${PN}-4.16.3-respect-user-flags.patch"
+)
+
+src_prepare() {
+	edos2unix downloadmanagerwidget.h downloadwidget.cpp downloadwidget.h
+	default
+}
+
+src_configure() {
+	eqmake6
+	# IDK if there is a better way to do this, qt6 puts this in a different dir
+	sed -e 's/bin\/qwebengine_convert_dict/libexec\/qwebengine_convert_dict/g' \
+		-i Makefile || die
+}
+
+src_install() {
+	einstalldocs
+	INSTALL_ROOT="${ED}" emake install
+}
diff --git a/net-im/whatsie/whatsie-4.16.3.ebuild b/net-im/whatsie/whatsie-4.16.3.ebuild
deleted file mode 100644
index 8919b85b6d47..000000000000
--- a/net-im/whatsie/whatsie-4.16.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt Based WhatsApp Client"
-HOMEPAGE="https://github.com/keshavbhatt/whatsie"
-SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-QT_MIN="5.15"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	>=dev-qt/qtcore-${QT_MIN}:5
-	>=dev-qt/qtgui-${QT_MIN}:5
-	>=dev-qt/qtnetwork-${QT_MIN}:5
-	>=dev-qt/qtpositioning-${QT_MIN}:5
-	>=dev-qt/qtwebengine-${QT_MIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QT_MIN}:5
-"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-	INSTALL_ROOT="${ED}" emake install
-}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 120831049740..5f700d551847 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,3 @@
-DIST zoom-6.2.10.4983_x86_64.tar.xz 210613920 BLAKE2B 2828ffe9205720490175054496d104b7146287a2aff13f81f37185e2943f514d228d4c11e9fc3c63f1e705f8698b15100db073e58ba5721eeafa34f1d9d9e8e2 SHA512 545770cfc4634d953ef778f60738ad8d0ed19a79d2422948d81288216762fe336edb0b77123c1dadf6b495bb64b8c097760446c0ce266c80a568a2efd3516088
 DIST zoom-6.3.1.5673_x86_64.tar.xz 212901792 BLAKE2B 625df68d633fea6258369c7572c99872361e608f37496c8d87b9bb18525e8f99c00dcb7a95ad8a28033a8e00940732f3bd324f9bb6c0e0e72fe62ef1c7503690 SHA512 f88ad40bf31943620e69259bd8c07ed61ff7b6a72d8a8c0fc1da3100e0e5ffa6125bdbe62516847f1be55a060efcb1752b7e4d876e42cfde11710d4b5e9a0fc1
-EBUILD zoom-6.2.10.4983.ebuild 5530 BLAKE2B dc0a90558fb8d006b6c28df5cfbec90e84ec5f73b6468d8bc32f0cb232a0ed7cdc824cb8388b59e5ed4194befeb29eba2efa2b00081fc65401197d25523c28c4 SHA512 79b60faed28a03ebb8155fe07a03794b96dc4afe08cab89d9030902c30262bafb492fddb888b8e208e3e446c29808b73753fe0669f33cae8ff79939775124739
-EBUILD zoom-6.3.1.5673.ebuild 5554 BLAKE2B 1a17c5c85026a413726e3f1a688f3ac72d63a7aeadf3b0c91802983bec4e255968f3c95cc06ed77b29953b340299768d71bcce28fca186fa81d0e8622fd79eaa SHA512 5051d96b1ca9a52aa3025422227f0bcf8bdf48be50dff66080253c42d3a061db51d8b93351b36090b27dcea8fb154154a825d708d9f3f4bb6a144edc27a1fded
-MISC metadata.xml 604 BLAKE2B 1348fe3b66031b2c26ecaffe705947364682250547027ba6e84e7b1315c007da43faf233669681bdd2b67d37a0a906dd0df0e69626c371f0c6c12569a77fa8d8 SHA512 9b1c9007923c32664f2b4f2c13d6c2e97bb0ba294428a05940214b81c19e3bdad16edf2f22729f0f44221c3b70ecd1a27a7a78112237e24fdfa9932a8ad6f39b
+EBUILD zoom-6.3.1.5673.ebuild 4665 BLAKE2B 0dc2e9c9a3b21cb182e60b2c0669011c0ba61ef74a4ae5ebf1bd3e95cf256911c80e8de75699ab45be40ff7d64a59aae33f5cc93a36c18c3c9a154b901eaf6e6 SHA512 9d66272faa0c6b959b4a1e0eeadd3eeb96d821e00dadb1e6bbd22eab442aa8120ce9b7d31e226ec1e66bb8d7fefb310667d27fc58ceb09960e360ab8762d3703
+MISC metadata.xml 506 BLAKE2B efb23c7defb4c8ebe6c507b50da29bfef536bb3c9be62a69d7bdf5f8b08059ed522c977f19c34fe977bd26d58ff0edd14f096c97d303ab91816101b653a8ad1a SHA512 1b50c34ec2a1db48f913d9d200620f968834be175538f8aa318735136b5a81401236318962d554af1046ebbeb5b3245ed75cc201817b64ac7127b60785068adb
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index a600614f9ab0..1ef47a2fbce3 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/metadata.xml
@@ -8,9 +8,6 @@
     <email>dilfridge@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="bundled-qt">
-      Use bundled Qt and icu instead of system-wide libs
-    </flag>
     <flag name="opencl">
       Use OpenCL for virtual background support (<pkg>virtual/opencl</pkg>)
     </flag>
diff --git a/net-im/zoom/zoom-6.2.10.4983.ebuild b/net-im/zoom/zoom-6.2.10.4983.ebuild
deleted file mode 100644
index d2041ad48ed9..000000000000
--- a/net-im/zoom/zoom-6.2.10.4983.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+bundled-qt opencl pulseaudio wayland +zoom-symlink"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="zoom-symlink? ( !games-engines/zoom )
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r calendar cef chatapp email json ringtone scheduler sip \
-		timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.so \
-		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe libclDNN64.so
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-		(	# Remove libs and plugins with unresolved soname dependencies.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.15" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-
-	make_desktop_entry "${EPREFIX}/opt/zoom/ZoomLauncher %U" Zoom \
-		videoconference-zoom "Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	mv "${ED}"/usr/share/applications/{ZoomLauncher-,}zoom.desktop || die
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-6.3.1.5673.ebuild b/net-im/zoom/zoom-6.3.1.5673.ebuild
index 200d22d4f37a..61473dfd1366 100644
--- a/net-im/zoom/zoom-6.3.1.5673.ebuild
+++ b/net-im/zoom/zoom-6.3.1.5673.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop linux-info readme.gentoo-r1 xdg-utils
+inherit desktop eapi9-pipestatus linux-info readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+bundled-qt opencl pulseaudio wayland +zoom-symlink"
+IUSE="opencl pulseaudio wayland +zoom-symlink"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="zoom-symlink? ( !games-engines/zoom )
@@ -23,7 +23,6 @@ RDEPEND="zoom-symlink? ( !games-engines/zoom )
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
 	media-libs/alsa-lib
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
@@ -56,25 +55,7 @@ RDEPEND="zoom-symlink? ( !games-engines/zoom )
 	x11-libs/xcb-util-wm
 	opencl? ( virtual/opencl )
 	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
+	wayland? ( dev-libs/wayland )"
 
 BDEPEND="dev-util/bbe"
 
@@ -105,12 +86,11 @@ src_install() {
 		scheduler sip timezones translations
 	doins *.pcm Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
-		aomhost libaomagent.so libcml.so libdvf.so libmkldnn.so \
+		aomhost libaomagent.so libcml.so libdvf.so libmkldnn.so libquazip.so \
 		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
 	fperms a+x /opt/zoom/cef/chrome-sandbox
 	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
 	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
 
 	if use opencl; then
 		doexe libclDNN64.so
@@ -122,33 +102,22 @@ src_install() {
 		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
 	fi
 
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-		(	# Remove libs and plugins with unresolved soname dependencies.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.15" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
+	doins -r Qt
+	find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+		-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755
+	pipestatus || die
+	(	# Remove libs and plugins with unresolved soname dependencies.
+		# Why does the upstream package contain such garbage? :-(
+		cd "${ED}"/opt/zoom/Qt || die
+		rm -r plugins/audio plugins/egldeviceintegrations \
+			plugins/platforms/libqeglfs.so plugins/platforms/libqlinuxfb.so \
+			plugins/platformthemes/libqgtk3.so qml/Qt/labs/lottieqt \
+			qml/QtQml/RemoteObjects qml/QtQuick/LocalStorage \
+			qml/QtQuick/Particles.2 qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
+			qml/QtQuick/XmlListModel || die
+		use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
+			plugins/platforms/libqwayland*.so qml/QtWayland || die
+	)
 
 	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom