gentoo resync : 05.12.2021

4 files changed, 7 insertions, 282 deletions

diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index d80fc932bb89..6d513acdc984 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,6 +1,5 @@
-AUX kfind-21.04.3-unused-dep.patch 9231 BLAKE2B 35c67d692f8920008758bf0b4a586c2cc711f8a819a7aea4f06e70cf7f4671ec7898701dc9dfeb6cbd84e0187ab05f4b9d77d38a2986d6474b2d44330e116a10 SHA512 5d80bd47d116199ab8138fcd53cbbc2f1ff992c6017d3e8d2c10696c7b4ad5db4a4a6b72984665309086bde791284725e8d44039838f57bd334c42208077d20e
-DIST kfind-21.04.3.tar.xz 284312 BLAKE2B dedca9757ccde97cc3446c73fa0acbf53303edd2f03be0ef236d12c833a10eb0a19bf138d209e85a8d1c50872bfb848758114f73f5da2e613c38b60a776ec1f5 SHA512 bfb985228e7fd96f6c88dff8792e64a1ccf9e999155acfce76de6cb434b02aab92bcb4c8473399a9de59049138809149f33b423bc46d47abc8b7ea4966bfd61c
 DIST kfind-21.08.3.tar.xz 286704 BLAKE2B 056ffd601b4093e08ad7494b6ddcce38f8a89000721ad014a73db98db2e032fdd29c613a308d5d18f3e0cdef7dd6ee83d7f81650119df75dfa7ae945f2daed82 SHA512 014455514d2da8d3fe4b1c2a348c73a6ad3ac1b7e125b9a57fc57df10ec3c4f3afd1b1998ad0025400ee7039bdbd695cbed04bf967d64e8b2ee33bf12679a933
-EBUILD kfind-21.04.3-r1.ebuild 1015 BLAKE2B 1400636cf99f44448fab80517704f614de197a5faf4e9fccb2fac978618f85ca4b52cc332294ef792114d5ea1332e6607d0f327e8073ad0d2e6c44637e840809 SHA512 8d78806d5e6cdc5b9399432d7ad22472cb943de63c817c0e5fe42dae4c45708026d3eb35017608b424c925558f43954c99545a01793daf873b50d09270689058
-EBUILD kfind-21.08.3.ebuild 976 BLAKE2B cee7589c954889176ca7ec63d17154ad11d33b803dd096975395c4f10a092674db19a2cf6407ba88f5d4eddbe8bda206608a04a8718646309f404aa359a36064 SHA512 429bca4aa29dacb4ede67d739230ccfdb0ea58a0e47eaf4d0afebcc216110d85d7a54f483e13851c230f93457c8281bf7a9ddbb56933de4595bf60741527bd2c
+DIST kfind-21.11.90.tar.xz 286772 BLAKE2B cd729299327fcd4d0d5fd2f57b94a24fb234c41f28baa03277472f4e790d6143ef186ebda74bdd10128e4ddd3929fc8482aa21416dae26d32f4c750c283d381b SHA512 a8403e15df97b25ca4c82418147b3f98e409a764f0293d0487644a9894d31e51702cd6dcecbc4ca96cce85551b997483d3a0f707438bdab1755c6a222769d892
+EBUILD kfind-21.08.3.ebuild 973 BLAKE2B 725f9b3c3f0cb1d9cad2dfb4706ea1aff3bf44abda8a3fa100b88785d17aaf6c9e90cf50605ff25eea3d29f603835b9db946074239ef45e7fb67764d431db41c SHA512 2b72ac81f1c947c981f90d7864a90764c0fb580d489c46382461fc507fc2a7b09cb6e79ff4eeee090aef09bb3b28b533c4230456b1e99213207b2dd7aea56ddf
+EBUILD kfind-21.11.90.ebuild 976 BLAKE2B c59818feeb4cbbcd2b46822c62b939b3ee4c19655aa302afea25031d61a0effcb867d0391c8e563f4d603f68cce875f75920b7afa9e7de5c0702fc2f2d649b43 SHA512 f748ee839a4e43b4ddb119d79bc3e4d0cfa54e0a3aa9ec4649d02acf8bdae4f7bbdb251b7f3db2508e821ac87cf94c590d5b638f84e852a93e44b6c8fee512f0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
deleted file mode 100644
index f348bf39b5d6..000000000000
--- a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From b23e8823d7c950b43259b8750f0d14c19fa5f31c Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 22 May 2021 07:15:04 +0200
-Subject: [PATCH] Clean up defunct KRegExpEditorInterface code
-
-This code is deprecated, defunct and partly commented out for years.
----
- CMakeLists.txt     |  1 -
- src/CMakeLists.txt |  1 -
- src/kftabdlg.cpp   | 48 +---------------------------------------------
- src/kftabdlg.h     |  4 ----
- src/kquery.cpp     | 31 +++++++-----------------------
- src/kquery.h       |  3 +--
- 6 files changed, 9 insertions(+), 79 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4587dd278..1c867f5b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     FileMetaData
-     I18n
-     KIO
--    TextWidgets
-     WidgetsAddons
- )
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 97d81a963..d24b5f4b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -22,7 +22,6 @@ KF5::CoreAddons
- KF5::FileMetaData
- KF5::I18n
- KF5::KIOWidgets
--KF5::TextWidgets
- KF5::WidgetsAddons
- KF5::XmlGui
- )
-diff --git a/src/kftabdlg.cpp b/src/kftabdlg.cpp
-index ddb9c7be0..f2c6cbf7a 100644
---- a/src/kftabdlg.cpp
-+++ b/src/kftabdlg.cpp
-@@ -29,8 +29,6 @@
- #include <KLineEdit>
- #include <KLocalizedString>
- #include <KMessageBox>
--#include <KRegExpEditorInterface>
--#include <KServiceTypeTrader>
- #include <KSharedConfig>
- #include <KShell>
- #include <KUrlComboBox>
-@@ -55,7 +53,6 @@ struct MimeTypes
- 
- KfindTabWidget::KfindTabWidget(QWidget *parent)
-     : QTabWidget(parent)
--    , regExpDialog(nullptr)
- {
-     // This validator will be used for all numeric edit fields
-     //KDigitValidator *digitV = new KDigitValidator(this);
-@@ -307,7 +304,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
- 
-     caseContextCb = new QCheckBox(i18n("Case s&ensitive"), pages[2]);
-     binaryContextCb = new QCheckBox(i18n("Include &binary files"), pages[2]);
--    regexpContentCb = new QCheckBox(i18n("Regular e&xpression"), pages[2]);
- 
-     const QString binaryTooltip
-         = i18n("<qt>This lets you search in any type of file, "
-@@ -315,13 +311,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-                "program files and images).</qt>");
-     binaryContextCb->setToolTip(binaryTooltip);
- 
--    QPushButton *editRegExp = nullptr;
--    if (!KServiceTypeTrader::self()->query(QStringLiteral("KRegExpEditor/KRegExpEditor")).isEmpty()) {
--        // The editor is available, so lets use it.
--        editRegExp = new QPushButton(i18n("&Edit..."), pages[2]);
--        editRegExp->setObjectName(QStringLiteral("editRegExp"));
--    }
--
-     metainfokeyEdit = new KLineEdit(pages[2]);
-     metainfoEdit = new KLineEdit(pages[2]);
-     QLabel *textMetaInfo = new QLabel(i18nc("as in search for", "fo&r:"), pages[2]);
-@@ -387,15 +376,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-         watcher->deleteLater();
-     });
- 
--    if (editRegExp) {
--        // The editor was available, so lets use it.
--        connect(regexpContentCb, &QCheckBox::toggled, editRegExp, &QPushButton::setEnabled);
--        editRegExp->setEnabled(false);
--        connect(editRegExp, &QPushButton::clicked, this, &KfindTabWidget::slotEditRegExp);
--    } else {
--        regexpContentCb->hide();
--    }
--
-     // Layout
-     tmp = sizeEdit->fontMetrics().boundingRect(QStringLiteral(" 00000 ")).width();
-     sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
-@@ -405,7 +385,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-     grid2->addWidget(textL, 1, 0);
-     grid2->addWidget(typeBox, 0, 1, 1, 3);
-     grid2->addWidget(textEdit, 1, 1, 1, 3);
--    grid2->addWidget(regexpContentCb, 2, 2);
-     grid2->addWidget(caseContextCb, 2, 1);
-     grid2->addWidget(binaryContextCb, 3, 1);
- 
-@@ -416,11 +395,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
- 
-     metainfokeyEdit->setText(QStringLiteral("*"));
- 
--    if (editRegExp) {
--        // The editor was available, so lets use it.
--        grid2->addWidget(editRegExp, 2, 3);
--    }
--
-     addTab(pages[0], i18n("Name/&Location"));
-     addTab(pages[2], i18nc("tab name: search by contents", "C&ontents"));
-     addTab(pages[1], i18n("&Properties"));
-@@ -532,25 +506,6 @@ void KfindTabWidget::loadHistory()
-     }
- }
- 
--void KfindTabWidget::slotEditRegExp()
--{
--#if 0
--    if (!regExpDialog) {
--        regExpDialog = KServiceTypeTrader::createInstanceFromQuery<QDialog>(QStringLiteral("KRegExpEditor/KRegExpEditor"), QString(), this);
--    }
--
--    KRegExpEditorInterface *iface = qobject_cast<KRegExpEditorInterface *>(regExpDialog);
--    if (!iface) {
--        return;
--    }
--
--    iface->setRegExp(textEdit->text());
--    if (regExpDialog->exec()) {
--        textEdit->setText(iface->regExp());
--    }
--#endif
--}
--
- void KfindTabWidget::setFocus()
- {
-     nameBox->setFocus();
-@@ -771,8 +726,7 @@ void KfindTabWidget::setQuery(KQuery *query)
- 
-     query->setShowHiddenFiles(hiddenFilesCb->isChecked());
- 
--    query->setContext(textEdit->text(), caseContextCb->isChecked(),
--                      binaryContextCb->isChecked(), regexpContentCb->isChecked());
-+    query->setContext(textEdit->text(), caseContextCb->isChecked(), binaryContextCb->isChecked());
- }
- 
- void KfindTabWidget::getDirectory()
-diff --git a/src/kftabdlg.h b/src/kftabdlg.h
-index e2a4912d6..336835a06 100644
---- a/src/kftabdlg.h
-+++ b/src/kftabdlg.h
-@@ -23,7 +23,6 @@ class QString;
- class QDate;
- class QRegExp;
- class KDateComboBox;
--class QDialog;
- class KComboBox;
- class QSpinBox;
- class QLabel;
-@@ -60,7 +59,6 @@ private Q_SLOTS:
-     void getDirectory();
-     void fixLayout();
-     void slotSizeBoxChanged(int);
--    void slotEditRegExp();
- 
- Q_SIGNALS:
-     void startSearch();
-@@ -112,8 +110,6 @@ private:
-     QSpinBox *sizeEdit;
-     QCheckBox *caseContextCb;
-     QCheckBox *binaryContextCb;
--    QCheckBox *regexpContentCb;
--    QDialog *regExpDialog;
- 
-     QUrl m_url;
- 
-diff --git a/src/kquery.cpp b/src/kquery.cpp
-index 91e45ed07..c6c7327bf 100644
---- a/src/kquery.cpp
-+++ b/src/kquery.cpp
-@@ -35,7 +35,6 @@ KQuery::KQuery(QObject *parent)
-     , m_recursive(false)
-     , m_casesensitive(false)
-     , m_search_binary(false)
--    , m_regexpForContent(false)
-     , m_useLocate(false)
-     , m_showHiddenFiles(false)
-     , job(nullptr)
-@@ -458,19 +457,11 @@ void KQuery::processQuery(const KFileItem &file)
-                 str.remove(xmlTags);
-             }
- 
--            if (m_regexpForContent) {
--                if (m_regexp.indexIn(str) >= 0) {
--                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
--                    found = true;
--                    break;
--                }
--            } else {
--                if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
--                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
--                    found = true;
--                    break;
--                }
--            }
-+	if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
-+	    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
-+	    found = true;
-+	    break;
-+	}
-             qApp->processEvents();
-         }
- 
-@@ -484,25 +475,17 @@ void KQuery::processQuery(const KFileItem &file)
-     m_foundFilesList.append(QPair<KFileItem, QString>(file, matchingLine));
- }
- 
--void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp)
-+void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary)
- {
-     m_context = context;
-     m_casesensitive = casesensitive;
-     m_search_binary = search_binary;
--    m_regexpForContent = useRegexp;
--    if (!m_regexpForContent) {
--        m_regexp.setPatternSyntax(QRegExp::Wildcard);
--    } else {
--        m_regexp.setPatternSyntax(QRegExp::RegExp);
--    }
-+    m_regexp.setPatternSyntax(QRegExp::Wildcard);
-     if (casesensitive) {
-         m_regexp.setCaseSensitivity(Qt::CaseSensitive);
-     } else {
-         m_regexp.setCaseSensitivity(Qt::CaseInsensitive);
-     }
--    if (m_regexpForContent) {
--        m_regexp.setPattern(m_context);
--    }
- }
- 
- void KQuery::setMetaInfo(const QString &metainfo, const QString &metainfokey)
-diff --git a/src/kquery.h b/src/kquery.h
-index 285b37214..2e581765c 100644
---- a/src/kquery.h
-+++ b/src/kquery.h
-@@ -38,7 +38,7 @@ public:
-     void setPath(const QUrl &url);
-     void setFileType(int filetype);
-     void setMimeType(const QStringList &mimetype);
--    void setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp);
-+    void setContext(const QString &context, bool casesensitive, bool search_binary);
-     void setUsername(const QString &username);
-     void setGroupname(const QString &groupname);
-     void setMetaInfo(const QString &metainfo, const QString &metainfokey);
-@@ -93,7 +93,6 @@ private:
-     QString m_metainfokey;
-     bool m_casesensitive;
-     bool m_search_binary;
--    bool m_regexpForContent;
-     bool m_useLocate;
-     bool m_showHiddenFiles;
-     QByteArray bufferLocate;
--- 
-GitLab
-
diff --git a/kde-apps/kfind/kfind-21.08.3.ebuild b/kde-apps/kfind/kfind-21.08.3.ebuild
index 8f4c42fd9fa9..4209b7a3f664 100644
--- a/kde-apps/kfind/kfind-21.08.3.ebuild
+++ b/kde-apps/kfind/kfind-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfind/kfind-21.04.3-r1.ebuild b/kde-apps/kfind/kfind-21.11.90.ebuild
index 072159c8561c..7d80d377e663 100644
--- a/kde-apps/kfind/kfind-21.04.3-r1.ebuild
+++ b/kde-apps/kfind/kfind-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
@@ -35,5 +35,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
-
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )