From a907228322492350c4814e69770f389ce5a6b298 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 14 Nov 2023 23:57:41 +0100
Subject: [PATCH] */*: Revert a5097f91..b52ec567

Should not have been pushed.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 app-cdr/kcdemu/Manifest                       |   1 -
 app-cdr/kcdemu/kcdemu-0.8.1.ebuild            |  35 --
 app-cdr/kcdemu/metadata.xml                   |   3 -
 app-doc/zeal/Manifest                         |   1 -
 ...-tool-tip-when-global-shortcuts-are-.patch |  15 -
 ...i-use-async-selection-in-search-edit.patch |  21 --
 ...r-send-key-events-to-web-view-s-focu.patch |  12 -
 ...ry-save-non-zero-docset-revision-in-.patch |  14 -
 ...eplace-deprecated-qAsConst-with-std-.patch |  91 -----
 app-doc/zeal/files/zeal-0.7.0-cmake.patch     | 317 ------------------
 .../zeal-0.7.0-disable-update-check.patch     |  27 --
 ...able-checking-for-updates-by-default.patch |  11 -
 app-doc/zeal/zeal-0.7.0.ebuild                |  70 ----
 dev-cpp/libcmis/Manifest                      |   2 -
 dev-cpp/libcmis/libcmis-0.6.0.ebuild          |  65 ----
 dev-cpp/libcmis/libcmis-9999.ebuild           |   8 +-
 dev-libs/plasma-wayland-protocols/Manifest    |   1 -
 .../plasma-wayland-protocols-1.11.0.ebuild    |  19 --
 media-gfx/photoqt/Manifest                    |   1 -
 media-gfx/photoqt/photoqt-3.3.ebuild          |  75 -----
 media-video/subtitlecomposer/Manifest         |   1 -
 .../subtitlecomposer-0.8.0.ebuild             |  56 ----
 net-libs/kdsoap-ws-discovery-client/Manifest  |   1 -
 .../kdsoap-ws-discovery-client-0.3.0.ebuild   |  48 ---
 net-libs/meanwhile/Manifest                   |   1 -
 net-libs/meanwhile/meanwhile-1.1.1.ebuild     |  46 ---
 26 files changed, 4 insertions(+), 938 deletions(-)
 delete mode 100644 app-cdr/kcdemu/kcdemu-0.8.1.ebuild
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-0001-fix-ui-add-tool-tip-when-global-shortcuts-are-.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-0002-fix-ui-use-async-selection-in-search-edit.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-0003-fix-browser-send-key-events-to-web-view-s-focu.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-0004-fix-registry-save-non-zero-docset-revision-in-.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-0005-refactor-replace-deprecated-qAsConst-with-std-.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-cmake.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-disable-update-check.patch
 delete mode 100644 app-doc/zeal/files/zeal-0.7.0-settings-disable-checking-for-updates-by-default.patch
 delete mode 100644 app-doc/zeal/zeal-0.7.0.ebuild
 delete mode 100644 dev-cpp/libcmis/libcmis-0.6.0.ebuild
 delete mode 100644 dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.11.0.ebuild
 delete mode 100644 media-gfx/photoqt/photoqt-3.3.ebuild
 delete mode 100644 media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
 delete mode 100644 net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild
 delete mode 100644 net-libs/meanwhile/meanwhile-1.1.1.ebuild

diff --git a/app-cdr/kcdemu/Manifest b/app-cdr/kcdemu/Manifest
index 6cdc908b5ef06..ec45be39aa44c 100644
--- a/app-cdr/kcdemu/Manifest
+++ b/app-cdr/kcdemu/Manifest
@@ -1,2 +1 @@
 DIST kde_cdemu-0.8.0.tar.bz2 25461 BLAKE2B 6fbcbdb1fed8e56d903844ef89039f4ec1090cbf7bb465c7a4a6aceb5f4710ec9b201532b54a6b5c463a34b042d9e6a4bf11fbcdeee8f5c53c0334084478ab29 SHA512 3d14d5ff2892622ed7668ea530d5023f81a9783b64d886c63711b3fb54389960479b9572cabafa54657a1d0206cf7506bfeecfef23495ff5105f9923b9b3dfd4
-DIST kde_cdemu-0.8.1.tar.zst 26918 BLAKE2B e28af40ebbb54d39f27eef3c52ec24d2cfdb53fd180cb3c4d73bafb1bb3bb41885bb86c7b3be9a1e4f4452703cc14b365a9f673d783c75eed7f725c7d093994b SHA512 769f62becd69e62e4cf1f6a9efbf04be9325846869df197fde61e5d2aac19ee6160718ad7123d8406986ecc5c49a3c20dbdd096554372ddb0bf56705ffcd1800
diff --git a/app-cdr/kcdemu/kcdemu-0.8.1.ebuild b/app-cdr/kcdemu/kcdemu-0.8.1.ebuild
deleted file mode 100644
index 282836b8ac4b6..0000000000000
--- a/app-cdr/kcdemu/kcdemu-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="kde_cdemu"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm unpacker
-
-DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
-HOMEPAGE="https://www.linux-apps.com/p/998461/"
-SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/${MY_PN}-${PV}.tar.zst"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=app-cdr/cdemu-2.0.0[cdemu-daemon]
-"
diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml
index d5c7babef1e53..8641e5bdd399b 100644
--- a/app-cdr/kcdemu/metadata.xml
+++ b/app-cdr/kcdemu/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kde-cdemu-manager</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index 66d93856ee1c2..ff4a3054c4af4 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -1,2 +1 @@
 DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d
-DIST zeal-0.7.0.tar.xz 784204 BLAKE2B 1926836ef18cf8a8ff80075de7e75d9b6f65af575a84fdaee54a482dcea7ee45ae0ce527bbe6def6e8415a07fffd9a2f6f68901f2e9023f6d71c6b76f381cfc2 SHA512 c4dd50c4a1e3fb7ffb402587f9473adec47026a68be10d1e8aad6f9cb9cb7a4c1f5905b9e2d205b9066d6daa4ced36238e27329944cee7de8386588f86145990
diff --git a/app-doc/zeal/files/zeal-0.7.0-0001-fix-ui-add-tool-tip-when-global-shortcuts-are-.patch b/app-doc/zeal/files/zeal-0.7.0-0001-fix-ui-add-tool-tip-when-global-shortcuts-are-.patch
deleted file mode 100644
index 59390b401b67f..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-0001-fix-ui-add-tool-tip-when-global-shortcuts-are-.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Commit 1d92d3c737f04e9f7ba369777495a1fa4178ddd4
---- a/src/libs/ui/settingsdialog.cpp
-+++ b/src/libs/ui/settingsdialog.cpp
-@@ -79,7 +79,10 @@ SettingsDialog::SettingsDialog(QWidget *parent)
-     setTabOrder(ui->fontSizeComboBox, ui->serifFontComboBox);
- 
-     // Disable global shortcut settings if not supported.
--    ui->globalHotKeyGroupBox->setEnabled(QxtGlobalShortcut::isSupported());
-+    if (!QxtGlobalShortcut::isSupported()) {
-+        ui->globalHotKeyGroupBox->setEnabled(false);
-+        ui->globalHotKeyGroupBox->setToolTip(tr("Global shortcuts are not supported on the current platform."));
-+    }
- 
-     QWebEngineSettings *webSettings = QWebEngineProfile::defaultProfile()->settings();
- 
diff --git a/app-doc/zeal/files/zeal-0.7.0-0002-fix-ui-use-async-selection-in-search-edit.patch b/app-doc/zeal/files/zeal-0.7.0-0002-fix-ui-use-async-selection-in-search-edit.patch
deleted file mode 100644
index 22ab93c5f5684..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-0002-fix-ui-use-async-selection-in-search-edit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Commit d5ce8a0f04dfc4d609cfcab75cc53135ba1a9557
---- a/src/libs/ui/widgets/searchedit.cpp
-+++ b/src/libs/ui/widgets/searchedit.cpp
-@@ -29,6 +29,7 @@
- #include <QKeyEvent>
- #include <QLabel>
- #include <QStyle>
-+#include <QTimer>
- 
- using namespace Zeal;
- using namespace Zeal::WidgetUi;
-@@ -82,7 +83,8 @@ void SearchEdit::selectQuery()
-         return;
-     }
- 
--    selectAll();
-+    // Avoid some race condition which breaks Ctrl+K shortcut.
-+    QTimer::singleShot(0, this, &QLineEdit::selectAll);
- }
- 
- bool SearchEdit::event(QEvent *event)
diff --git a/app-doc/zeal/files/zeal-0.7.0-0003-fix-browser-send-key-events-to-web-view-s-focu.patch b/app-doc/zeal/files/zeal-0.7.0-0003-fix-browser-send-key-events-to-web-view-s-focu.patch
deleted file mode 100644
index 33eb895487fcd..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-0003-fix-browser-send-key-events-to-web-view-s-focu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Commit f2212eb4f0c9b39a0a207995b097a6b0238b3cbb
---- a/src/libs/browser/searchtoolbar.cpp
-+++ b/src/libs/browser/searchtoolbar.cpp
-@@ -137,7 +137,7 @@ bool SearchToolBar::eventFilter(QObject *object, QEvent *event)
-         case Qt::Key_Up:
-         case Qt::Key_PageDown:
-         case Qt::Key_PageUp:
--            QCoreApplication::sendEvent(m_webView, event);
-+            QCoreApplication::sendEvent(m_webView->focusProxy(), event);
-             return true;
-         default:
-             break;
diff --git a/app-doc/zeal/files/zeal-0.7.0-0004-fix-registry-save-non-zero-docset-revision-in-.patch b/app-doc/zeal/files/zeal-0.7.0-0004-fix-registry-save-non-zero-docset-revision-in-.patch
deleted file mode 100644
index 996b670a2c7e9..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-0004-fix-registry-save-non-zero-docset-revision-in-.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Commit 2cefcd45423e58283372a4c735609c284eded410
---- a/src/libs/registry/docsetmetadata.cpp
-+++ b/src/libs/registry/docsetmetadata.cpp
-@@ -89,8 +89,8 @@ void DocsetMetadata::save(const QString &path, const QString &version)
-     if (!version.isEmpty())
-         jsonObject[QStringLiteral("version")] = version;
- 
--    if (version == latestVersion() && m_revision == 0)
--        jsonObject[QStringLiteral("revision")] = m_revision;
-+    if (version == latestVersion() && m_revision > 0)
-+        jsonObject[QStringLiteral("revision")] = QString::number(m_revision);
- 
-     if (!m_feedUrl.isEmpty())
-         jsonObject[QStringLiteral("feed_url")] = m_feedUrl.toString();
diff --git a/app-doc/zeal/files/zeal-0.7.0-0005-refactor-replace-deprecated-qAsConst-with-std-.patch b/app-doc/zeal/files/zeal-0.7.0-0005-refactor-replace-deprecated-qAsConst-with-std-.patch
deleted file mode 100644
index 7d618b5d7bd86..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-0005-refactor-replace-deprecated-qAsConst-with-std-.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Commit 9630cc94c155d87295e51b41fbab2bd5798f8229
---- a/src/libs/registry/docset.cpp
-+++ b/src/libs/registry/docset.cpp
-@@ -458,7 +458,7 @@ void Docset::loadSymbols(const QString &symbolType) const
-     // with it.first and it.second respectively pointing to the start and the end
-     // of the range of nodes having symbolType as key. It effectively represents a
-     // contiguous view over the nodes with a specified key.
--    for (auto it = qAsConst(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
-+    for (auto it = std::as_const(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
-         loadSymbols(symbolType, it.first.value());
-     }
- }
-@@ -519,7 +519,7 @@ void Docset::createIndex()
-     }
- 
-     // Drop old indexes
--    for (const QString &oldIndexName : qAsConst(oldIndexes)) {
-+    for (const QString &oldIndexName : std::as_const(oldIndexes)) {
-         m_db->execute(indexDropQuery.arg(oldIndexName));
-     }
- 
-diff --git a/src/libs/registry/docsetmetadata.cpp b/src/libs/registry/docsetmetadata.cpp
-index 0678a13..5144e2f 100644
---- a/src/libs/registry/docsetmetadata.cpp
-+++ b/src/libs/registry/docsetmetadata.cpp
-@@ -97,7 +97,7 @@ void DocsetMetadata::save(const QString &path, const QString &version)
- 
-     if (!m_urls.isEmpty()) {
-         QJsonArray urls;
--        for (const QUrl &url : qAsConst(m_urls)) {
-+        for (const QUrl &url : std::as_const(m_urls)) {
-             urls.append(url.toString());
-         }
- 
-diff --git a/src/libs/registry/docsetregistry.cpp b/src/libs/registry/docsetregistry.cpp
-index 9776a19..17be79e 100644
---- a/src/libs/registry/docsetregistry.cpp
-+++ b/src/libs/registry/docsetregistry.cpp
-@@ -101,7 +101,7 @@ void DocsetRegistry::setFuzzySearchEnabled(bool enabled)
- 
-     m_isFuzzySearchEnabled = enabled;
- 
--    for (Docset *docset : qAsConst(m_docsets)) {
-+    for (Docset *docset : std::as_const(m_docsets)) {
-         docset->setFuzzySearchEnabled(enabled);
-     }
- }
-@@ -193,7 +193,7 @@ Docset *DocsetRegistry::docset(int index) const
- 
- Docset *DocsetRegistry::docsetForUrl(const QUrl &url)
- {
--    for (Docset *docset : qAsConst(m_docsets)) {
-+    for (Docset *docset : std::as_const(m_docsets)) {
-         if (docset->baseUrl().isParentOf(url))
-             return docset;
-     }
-@@ -226,7 +226,7 @@ void DocsetRegistry::_runQuery(const QString &query)
- 
-     const SearchQuery searchQuery = SearchQuery::fromString(query);
-     if (searchQuery.hasKeywords()) {
--        for (Docset *docset : qAsConst(m_docsets)) {
-+        for (Docset *docset : std::as_const(m_docsets)) {
-             if (searchQuery.hasKeywords(docset->keywords()))
-                 enabledDocsets << docset;
-         }
-diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
-index 4e3788b..18d0409 100644
---- a/src/libs/ui/docsetsdialog.cpp
-+++ b/src/libs/ui/docsetsdialog.cpp
-@@ -687,7 +687,7 @@ QNetworkReply *DocsetsDialog::download(const QUrl &url)
- 
- void DocsetsDialog::cancelDownloads()
- {
--    for (QNetworkReply *reply : qAsConst(m_replies)) {
-+    for (QNetworkReply *reply : std::as_const(m_replies)) {
-         // Hide progress bar
-         QListWidgetItem *listItem
-                 = ui->availableDocsetList->item(reply->property(ListItemIndexProperty).toInt());
-diff --git a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
-index a40c772..7a832ad 100644
---- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
-+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
-@@ -152,7 +152,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ
-     }
- 
-     bool failed = false;
--    for (xcb_void_cookie_t cookie : qAsConst(xcbCookies)) {
-+    for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) {
-         QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
-         failed = !error.isNull();
-     }
diff --git a/app-doc/zeal/files/zeal-0.7.0-cmake.patch b/app-doc/zeal/files/zeal-0.7.0-cmake.patch
deleted file mode 100644
index c5907085f1df2..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-cmake.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 8ac4da628ff241145addb23376572d7ac13904f0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 3 Nov 2023 15:51:09 +0100
-Subject: [PATCH 1/3] build(cmake): Set CMAKE_COMPILE_WARNING_AS_ERROR only for
- ZEAL_RELEASE_BUILD=OFF
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6a31c6..dc7ffc5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,6 +45,10 @@ if(NOT ZEAL_RELEASE_BUILD)
-     else()
-         set(ZEAL_VERSION_SUFFIX "-dev")
-     endif()
-+
-+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
-+        set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
-+    endif()
- endif()
- 
- set(ZEAL_VERSION_FULL "${Zeal_VERSION}${ZEAL_VERSION_SUFFIX}")
-@@ -59,9 +63,5 @@ add_custom_target(zeal_version
-     VERBATIM
- )
- 
--if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
--    set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
--endif()
--
- add_subdirectory(assets)
- add_subdirectory(src)
--- 
-2.42.0
-
-
-From 5a2eb812a822269e836c05322de3658911ce3ba3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 3 Nov 2023 16:01:49 +0100
-Subject: [PATCH 2/3] cmake: Import QtVersionOption.cmake from ECM (available
- since 5.82.0)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/QtVersionOption.cmake | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
- create mode 100644 cmake/QtVersionOption.cmake
-
-diff --git a/cmake/QtVersionOption.cmake b/cmake/QtVersionOption.cmake
-new file mode 100644
-index 0000000..ea37da2
---- /dev/null
-+++ b/cmake/QtVersionOption.cmake
-@@ -0,0 +1,36 @@
-+# SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
-+#
-+# SPDX-License-Identifier: BSD-3-Clause
-+
-+#[=======================================================================[.rst:
-+QtVersionOption
-+---------------
-+
-+Adds a build option to select the major Qt version if necessary,
-+that is, if the major Qt version has not yet been determined otherwise
-+(e.g. by a corresponding ``find_package()`` call).
-+This module is typically included by other modules requiring knowledge
-+about the major Qt version.
-+
-+``QT_MAJOR_VERSION`` is defined to either be "5" or "6".
-+
-+Since 5.82.0.
-+#]=======================================================================]
-+
-+if (DEFINED QT_MAJOR_VERSION)
-+    return()
-+endif()
-+
-+if (TARGET Qt5::Core)
-+    set(QT_MAJOR_VERSION 5)
-+elseif (TARGET Qt6::Core)
-+    set(QT_MAJOR_VERSION 6)
-+else()
-+    option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
-+
-+    if (BUILD_WITH_QT6)
-+        set(QT_MAJOR_VERSION 6)
-+    else()
-+        set(QT_MAJOR_VERSION 5)
-+    endif()
-+endif()
--- 
-2.42.0
-
-
-From 1976d46b9a2b193c34fab3d01492198a00219f54 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 3 Nov 2023 16:11:41 +0100
-Subject: [PATCH 3/3] build(cmake): Switch to ECM's QtVersionOption and
- QT_MAJOR_VERSION
-
-Module imported from KDE's ECM which is already in use by parts of this project.
-This avoids build system automagic, providing a well known default cmake switch
-to distributions.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                               |  6 +++---
- assets/freedesktop/CMakeLists.txt            |  2 +-
- src/app/CMakeLists.txt                       | 10 +++++-----
- src/libs/browser/CMakeLists.txt              |  4 ++--
- src/libs/core/CMakeLists.txt                 |  6 +++---
- src/libs/registry/CMakeLists.txt             |  4 ++--
- src/libs/sidebar/CMakeLists.txt              |  4 ++--
- src/libs/ui/CMakeLists.txt                   |  4 ++--
- src/libs/ui/qxtglobalshortcut/CMakeLists.txt |  8 ++++----
- src/libs/ui/widgets/CMakeLists.txt           |  4 ++--
- src/libs/util/CMakeLists.txt                 |  4 ++--
- 11 files changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dc7ffc5..deb376d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,9 +21,9 @@ endif()
- set(PROJECT_COMPANY_NAME "Oleg Shparber")
- set(PROJECT_COPYRIGHT "© 2013-2023 Oleg Shparber and other contributors")
- 
--# Find available major Qt version. It will be stored in QT_VERSION_MAJOR.
--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
--if(QT_VERSION_MAJOR EQUAL 6)
-+# Select major Qt version. It will be stored in QT_MAJOR_VERSION if not already set.
-+include(QtVersionOption)
-+if (QT_MAJOR_VERSION EQUAL "6")
-     set(QT_MINIMUM_VERSION 6.2.0)
- else()
-     set(QT_MINIMUM_VERSION 5.9.5)
-diff --git a/assets/freedesktop/CMakeLists.txt b/assets/freedesktop/CMakeLists.txt
-index aa1b9b5..0dfc6b6 100644
---- a/assets/freedesktop/CMakeLists.txt
-+++ b/assets/freedesktop/CMakeLists.txt
-@@ -3,7 +3,7 @@ if(UNIX AND NOT APPLE)
-     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-     include(ECMInstallIcons)
- 
--    if(QT_VERSION_MAJOR EQUAL 5)
-+    if(QT_MAJOR_VERSION EQUAL 5)
-         include(KDEInstallDirs)
-     else()
-         # Workaround until KDEInstallDirs6 is ready to use.
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index 5c0e6d1..4e2ae7e 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -1,5 +1,5 @@
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
--if (Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Widgets REQUIRED)
-+if (Qt${QT_MAJOR_VERSION}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION)
-     message(FATAL_ERROR "Qt version >= ${QT_MINIMUM_VERSION} is required.")
- endif()
- 
-@@ -14,7 +14,7 @@ set(PROJECT_EXECUTABLE_NAME "${_project_output_name}${CMAKE_EXECUTABLE_SUFFIX}")
- message(STATUS "Project executable name: ${PROJECT_EXECUTABLE_NAME}")
- 
- # Only support installing runtime dependencies with Qt >=6.5.1 (see QTBUG-111741).
--if(Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.1")
-+if(Qt${QT_MAJOR_VERSION}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.1")
-     set(_use_qt_cmake_commands TRUE)
- 
-     qt_standard_project_setup()
-@@ -29,7 +29,7 @@ else()
-     set(App_RESOURCES) # Silence CMake warning.
- endif()
- 
--if(QT_VERSION_MAJOR EQUAL 6)
-+if(QT_MAJOR_VERSION EQUAL 6)
-     qt_add_executable(App WIN32
-         main.cpp
-         zeal.qrc
-@@ -43,7 +43,7 @@ else()
-     )
- endif()
- 
--target_link_libraries(App PRIVATE Core Util Qt${QT_VERSION_MAJOR}::Widgets)
-+target_link_libraries(App PRIVATE Core Util Qt${QT_MAJOR_VERSION}::Widgets)
- 
- set_target_properties(App PROPERTIES
-     OUTPUT_NAME ${_project_output_name}
-diff --git a/src/libs/browser/CMakeLists.txt b/src/libs/browser/CMakeLists.txt
-index d0abfab..5690926 100644
---- a/src/libs/browser/CMakeLists.txt
-+++ b/src/libs/browser/CMakeLists.txt
-@@ -10,5 +10,5 @@ add_library(Browser STATIC
- 
- target_link_libraries(Browser)
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WebChannel WebEngineWidgets REQUIRED)
--target_link_libraries(Browser Qt${QT_VERSION_MAJOR}::WebChannel Qt${QT_VERSION_MAJOR}::WebEngineWidgets)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS WebChannel WebEngineWidgets REQUIRED)
-+target_link_libraries(Browser Qt${QT_MAJOR_VERSION}::WebChannel Qt${QT_VERSION_MAJOR}::WebEngineWidgets)
-diff --git a/src/libs/core/CMakeLists.txt b/src/libs/core/CMakeLists.txt
-index 7dfe901..76d20d3 100644
---- a/src/libs/core/CMakeLists.txt
-+++ b/src/libs/core/CMakeLists.txt
-@@ -16,10 +16,10 @@ add_definitions(-DCPPHTTPLIB_USE_POLL)
- 
- target_link_libraries(Core Registry Ui)
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network WebEngineCore Widgets REQUIRED)
--target_link_libraries(Core Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::WebEngineCore Qt${QT_VERSION_MAJOR}::Widgets)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Network WebEngineCore Widgets REQUIRED)
-+target_link_libraries(Core Qt${QT_MAJOR_VERSION}::Network Qt${QT_VERSION_MAJOR}::WebEngineCore Qt${QT_VERSION_MAJOR}::Widgets)
- 
--if(QT_VERSION_MAJOR EQUAL 6)
-+if(QT_MAJOR_VERSION EQUAL 6)
-     find_package(Qt6 COMPONENTS WebEngineCore Widgets REQUIRED)
-     target_link_libraries(Core Qt6::WebEngineCore)
- else()
-diff --git a/src/libs/registry/CMakeLists.txt b/src/libs/registry/CMakeLists.txt
-index 2fbaba4..0a105eb 100644
---- a/src/libs/registry/CMakeLists.txt
-+++ b/src/libs/registry/CMakeLists.txt
-@@ -12,5 +12,5 @@ add_library(Registry STATIC
-     searchresult.h
- )
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Concurrent Gui Network REQUIRED)
--target_link_libraries(Registry Util Qt${QT_VERSION_MAJOR}::Concurrent Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Concurrent Gui Network REQUIRED)
-+target_link_libraries(Registry Util Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network)
-diff --git a/src/libs/sidebar/CMakeLists.txt b/src/libs/sidebar/CMakeLists.txt
-index 133c9d9..498f654 100644
---- a/src/libs/sidebar/CMakeLists.txt
-+++ b/src/libs/sidebar/CMakeLists.txt
-@@ -7,5 +7,5 @@ add_library(Sidebar STATIC
- 
- target_link_libraries(Sidebar)
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
--target_link_libraries(Sidebar Qt${QT_VERSION_MAJOR}::Widgets)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Widgets REQUIRED)
-+target_link_libraries(Sidebar Qt${QT_MAJOR_VERSION}::Widgets)
-diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
-index 2937c5a..cb66b98 100644
---- a/src/libs/ui/CMakeLists.txt
-+++ b/src/libs/ui/CMakeLists.txt
-@@ -23,5 +23,5 @@ add_library(Ui STATIC
- 
- target_link_libraries(Ui Browser Sidebar QxtGlobalShortcut Widgets Registry)
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WebEngineWidgets REQUIRED)
--target_link_libraries(Ui Qt${QT_VERSION_MAJOR}::WebEngineWidgets)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS WebEngineWidgets REQUIRED)
-+target_link_libraries(Ui Qt${QT_MAJOR_VERSION}::WebEngineWidgets)
-diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-index f1c6a05..1120a70 100644
---- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-@@ -21,8 +21,8 @@ endif()
- 
- add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES})
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
--target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Gui REQUIRED)
-+target_link_libraries(QxtGlobalShortcut Qt${QT_MAJOR_VERSION}::Gui)
- 
- if(APPLE)
-     find_library(CARBON_LIBRARY Carbon)
-@@ -30,11 +30,11 @@ if(APPLE)
- elseif(UNIX AND X11_FOUND)
-     target_link_libraries(QxtGlobalShortcut ${X11_LIBRARIES})
- 
--    if(QT_VERSION_MAJOR EQUAL 5)
-+    if(QT_MAJOR_VERSION EQUAL 5)
-         find_package(Qt5 COMPONENTS X11Extras REQUIRED)
-         target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
-     else()
--        target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
-+        target_link_libraries(QxtGlobalShortcut Qt${QT_MAJOR_VERSION}::GuiPrivate)
-     endif()
- 
-     find_package(ECM REQUIRED NO_MODULE)
-diff --git a/src/libs/ui/widgets/CMakeLists.txt b/src/libs/ui/widgets/CMakeLists.txt
-index 09d12dd..2e74e1d 100644
---- a/src/libs/ui/widgets/CMakeLists.txt
-+++ b/src/libs/ui/widgets/CMakeLists.txt
-@@ -5,5 +5,5 @@ add_library(Widgets STATIC
-     toolbarframe.cpp
- )
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
--target_link_libraries(Widgets Qt${QT_VERSION_MAJOR}::Widgets)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Widgets REQUIRED)
-+target_link_libraries(Widgets Qt${QT_MAJOR_VERSION}::Widgets)
-diff --git a/src/libs/util/CMakeLists.txt b/src/libs/util/CMakeLists.txt
-index a9cf9a5..7829c35 100644
---- a/src/libs/util/CMakeLists.txt
-+++ b/src/libs/util/CMakeLists.txt
-@@ -9,8 +9,8 @@ add_library(Util STATIC
-     caseinsensitivemap.h
- )
- 
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
--target_link_libraries(Util Qt${QT_VERSION_MAJOR}::Core)
-+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
-+target_link_libraries(Util Qt${QT_MAJOR_VERSION}::Core)
- 
- find_package(SQLite3 REQUIRED)
- target_link_libraries(Util SQLite::SQLite3)
--- 
-2.42.0
-
diff --git a/app-doc/zeal/files/zeal-0.7.0-disable-update-check.patch b/app-doc/zeal/files/zeal-0.7.0-disable-update-check.patch
deleted file mode 100644
index a24866b53c76f..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-disable-update-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 797fa11f0e53eda7f244de3065d9efd1a7cac87b Mon Sep 17 00:00:00 2001
-From: Henning Schild <henning@hennsch.de>
-Date: Sat, 9 Mar 2019 10:29:54 +0100
-Subject: [PATCH] settings: disable checking for updates by default
-
-Signed-off-by: Henning Schild <henning@hennsch.de>
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/libs/core/settings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
-index 8bcc6e6..6f163c6 100644
---- a/src/libs/core/settings.cpp
-+++ b/src/libs/core/settings.cpp
-@@ -95,7 +95,7 @@ void Settings::load()
- 
-     // TODO: Put everything in groups
-     startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool();
--    checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool();
-+    checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool();
- 
-     showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool();
-     minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool();
--- 
-2.42.0
-
diff --git a/app-doc/zeal/files/zeal-0.7.0-settings-disable-checking-for-updates-by-default.patch b/app-doc/zeal/files/zeal-0.7.0-settings-disable-checking-for-updates-by-default.patch
deleted file mode 100644
index bcabaae0bd49a..0000000000000
--- a/app-doc/zeal/files/zeal-0.7.0-settings-disable-checking-for-updates-by-default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libs/core/settings.cpp
-+++ b/src/libs/core/settings.cpp
-@@ -95,7 +95,7 @@ void Settings::load()
- 
-     // TODO: Put everything in groups
-     startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool();
--    checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool();
-+    checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool();
- 
-     showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool();
-     minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool();
diff --git a/app-doc/zeal/zeal-0.7.0.ebuild b/app-doc/zeal/zeal-0.7.0.ebuild
deleted file mode 100644
index 6ad8aeb1b6a3b..0000000000000
--- a/app-doc/zeal/zeal-0.7.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/libarchive:=
-	dev-db/sqlite:3
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-RDEPEND="${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-BDEPEND="kde-frameworks/extra-cmake-modules:*"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-update-check.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-src_prepare() {
-# 	cat "${PATCHES[@]}" | grep '^+++' | cut -s -d / -f 2- | sort -u \
-# 		| while read -r file
-# 	do
-# 		dos2unix "${file}" || die "Failed to convert line endings in ${file}"
-# 	done
-
-	cmake_src_prepare
-
-	sed -i -e '/^ *set(CMAKE_COMPILE_WARNING_AS_ERROR ON)$/d' \
-		CMakeLists.txt
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZEAL_RELEASE_BUILD=ON
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index 63cfc415531c5..6dd6b81353dbe 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,4 +1,2 @@
 DIST libcmis-0.5.2-patchset.tar.xz 16632 BLAKE2B 0a9802955059214428e7c2d6171093b171e47899de05404ee462bbf2c68c808927759a0808d79aa3aa9c8b9cd1a60b55686f7596b121701704a2d9720d6a8ba8 SHA512 bca4cc908e5510a9f597d6f1b560b3bbfdcda185b79d21320c6e3f7e5c559b7dda375407dfd6f05420b6f4edd666f6e7e70b7b72808506acc22fdfdab344f52c
 DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde
-DIST libcmis-0.6.0-patchset.tar.xz 2728 BLAKE2B 264c6ef7a273449c0887c9a2891e8df44517df0b274303037e57946ff44c9186e7e54a6ca3919b530d9f0c1750bb711f524c3e45474a1dabbb66e2bce129b10c SHA512 7325edb0e19a0bee953a853086c4289a7e6edbd6a885fedf6bbfdff48bd5a3170538be196f404d36f629964b21de404c256c4bc1310f7ca5e2bf25e10043b5a7
-DIST libcmis-0.6.0.tar.gz 294976 BLAKE2B b78ead81577a0edf3a47dfae6672bf27e54c5ee8f37b0f145a61eaca792565187d346a1c60544d5ee0cf00d3b6f38d7e77ebaae5202a1d61cf43a280734a9b93 SHA512 b9de99b0693793eec7936d6c42d75ef67145c6767a66aea5c665cd99022911a6da5d6ceedf9054e009a696ba47e8b4e4b80003670209840f388f7a9ad1cd8bf5
diff --git a/dev-cpp/libcmis/libcmis-0.6.0.ebuild b/dev-cpp/libcmis/libcmis-0.6.0.ebuild
deleted file mode 100644
index f24a427bd1442..0000000000000
--- a/dev-cpp/libcmis/libcmis-0.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-	inherit git-r3
-else
-	PATCHSET="${P}-patchset"
-	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-# 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-inherit autotools
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.6"
-IUSE="man test tools"
-
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		app-text/docbook2X
-		dev-libs/libxslt
-	)
-	test? (
-		dev-util/cppcheck
-		dev-util/cppunit
-	)
-"
-
-PATCHES=( "${WORKDIR}/${PATCHSET}" ) # from git master, to be 0.6.1
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--program-suffix=-${SLOT}
-		--disable-werror
-		$(use_with man)
-		$(use_enable test tests)
-		$(use_enable tools client)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index 3ab040210d77c..10de5182674bb 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools
 
@@ -16,7 +16,7 @@ DESCRIPTION="C++ client library for the CMIS interface"
 HOMEPAGE="https://github.com/tdf/libcmis"
 
 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.6"
+SLOT="0.5"
 IUSE="man test tools"
 
 RESTRICT="test"
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--program-suffix=-${SLOT}
+		--program-suffix=-$(ver_cut 1-2)
 		--disable-werror
 		$(use_with man)
 		$(use_enable test tests)
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index ad7e9638c7dac..8afa40faf5722 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,2 +1 @@
 DIST plasma-wayland-protocols-1.10.0.tar.xz 43268 BLAKE2B 1f0bc6fcd822ed8f010a1e9144b4e423e44de04c429e39a465e2ef5e59553d22db08fc379b84cc93624fa5dd64ca00ddc7d0e788251809036bfd09c8fe6ae0b7 SHA512 ddb09de9b3320f8e10d21c5d201ffe43d7e1f2f6c0d0c1b33aced28d8c324c9439800b4bd1516e7a34e45b1ac94e252c825216378d52b5cd6d671d73baa24c03
-DIST plasma-wayland-protocols-1.11.0.tar.xz 43992 BLAKE2B 8e048033488c5bb57ced545927ba1ca1dd2df222666afd737b412521923eff6d8a44dfba3c5f1928158dad695b2cfb050a4603dae17947a36d1e8866369a0dfe SHA512 2ad421913ac807de5ced4cfdaf54db645eaec12fb1a4d9d169a904c14a3d7d174066c005a0730aa90e50822fec087521b2a564fe4f2f3fb9dbd57eec2a7325b5
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.11.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.11.0.ebuild
deleted file mode 100644
index 6835a08de545f..0000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.11.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI=true
-KFMIN=5.82.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index dafca25005d18..4e6d861d95f5e 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,2 +1 @@
 DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba
-DIST photoqt-3.3.tar.gz 1407575 BLAKE2B 8106519dbce79e523ca350a664ef38f20016538407baaef7757183fcd3e5d0351610265cffd53a6d188da8aa3167456b4ed5db0527d673c276ba2a8331bce802 SHA512 d21537b5f56e016b49be6dfd91c47c4acf26d739921a44242a8f53dd3e5bea00c807bf71b4224f689e25b23f5c0126aa5258ffe0ad1ff50e4c895aa7ba523fd5
diff --git a/media-gfx/photoqt/photoqt-3.3.ebuild b/media-gfx/photoqt/photoqt-3.3.ebuild
deleted file mode 100644
index e6de5535bbdb0..0000000000000
--- a/media-gfx/photoqt/photoqt-3.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm optfeature
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="devil exif freeimage geolocation graphicsmagick imagemagick mpv pdf raw"
-
-COMMON_DEPEND="
-	app-arch/libarchive:=
-	app-arch/unrar
-	dev-libs/pugixml
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtimageformats:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	devil? ( media-libs/devil )
-	exif? ( media-gfx/exiv2:=[bmff] )
-	freeimage? ( media-libs/freeimage )
-	geolocation? ( dev-qt/qtpositioning:5[qml] )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	mpv? ( media-video/mpv:=[libmpv] )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCHROMECAST=OFF # TODO needs python
-		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exif)
-		-DEXIV2_ENABLE_BMFF=$(usex exif)
-		-DFREEIMAGE=$(usex freeimage)
-		-DLOCATION=$(usex geolocation)
-		-DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
-		-DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
-		-DVIDEO_MPV=$(usex mpv)
-		-DPOPPLER=$(usex pdf)
-		-DRAW=$(usex raw)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats
-	ecm_pkg_postinst
-}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 93542c9fcd388..f8cfd0d22adc5 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,3 +1,2 @@
 DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
 DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
-DIST subtitlecomposer-0.8.0.tar.xz 730800 BLAKE2B f4d89b11f7d0669ee4594739df06f1bac91c1defacc9c27f25bff9709140c0b56a8927b2f4f79544bd35475db558c7fa2e35bff912704dd9d4e5a745a44a373a SHA512 463824631b025c760423244434000c6e7f7d44097fb7a9178ada505daa6329de0649219f563431e98d8e780fce2b1f0a39cbd77a998ece3d131166045ae40dee
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
deleted file mode 100644
index d3492864a27b1..0000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://subtitlecomposer.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="unicode"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	media-libs/openal
-	media-video/ffmpeg:0=
-	unicode? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434
-		$(cmake_use_find_package unicode ICU)
-	)
-
-	ecm_src_configure
-}
diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
index 1551a85a33c3d..d9b499b3b6ecc 100644
--- a/net-libs/kdsoap-ws-discovery-client/Manifest
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -1,2 +1 @@
 DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f
-DIST kdsoap-ws-discovery-client-0.3.0.tar.xz 30948 BLAKE2B e8a9e0f0cb3eee9e942436b4a8d07d7b8ab6578fecd5b3d59aadee7af91268945c4b4c37619212fb0f54038de65d38b318c33717f3e0eff07b088a101a0d72c6 SHA512 24c437686fc7d6659f610d030b263cef33c35e4c4f4f8a750068d3b2dcd166142d32d21c3d15a14f6ec7eb87b28d883d1d1ba8e11497ea75a1328e29a256a5c8
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild
deleted file mode 100644
index b8b71ffcdab1d..0000000000000
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-inherit ecm kde.org
-
-DESCRIPTION="WS-Discovery client library based on KDSoap"
-HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client"
-SRC_URI="mirror://kde/unstable/${PN/discovery/discover}/${P}.tar.xz"
-
-LICENSE="CC0-1.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	>=net-libs/kdsoap-2.0.0:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qtxml:5 )
-"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch )
-
-src_prepare() {
-	ecm_src_prepare
-	use test || ecm_punt_qt_module Xml
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-		-DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	ecm_src_install
-}
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index d8c44b440353c..2f862a91a8476 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,2 +1 @@
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-DIST meanwhile-1.1.1.tar.gz 180449 BLAKE2B ec4c2a4713f78b6e780f4b7c64b0efbde98275643814010fca995cedb49e7141a0d3065807cab19b78ef9d9813ebc91e2dcf7ee1abc956df91c64af5a7e2aa45 SHA512 89ddb1711ee5c5f5ec2e47b47e4eaf4623b5638a121a87bc905f86b201af753a2689b68ec8397a7cd1578a5a773a289bbe53f38acde2bf0598ce3f25c0dd645c
diff --git a/net-libs/meanwhile/meanwhile-1.1.1.ebuild b/net-libs/meanwhile/meanwhile-1.1.1.ebuild
deleted file mode 100644
index 415031394c179..0000000000000
--- a/net-libs/meanwhile/meanwhile-1.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Meanwhile (Sametime protocol) library"
-HOMEPAGE="https://github.com/obriencj/meanwhile"
-SRC_URI="https://github.com/obriencj/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc debug"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	dev-libs/gmp
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2-gentoo-fhs-samples.patch ) # bug 241298
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fno-tree-vrp
-
-	econf \
-		--enable-doxygen=$(usex doc) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}