gentoo resync : 17.07.2021

4 files changed, 276 insertions, 40 deletions

diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 1b8bd2d5ecb5..90a77c61f036 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,7 +1,6 @@
+AUX kfind-21.04.3-unused-dep.patch 9231 BLAKE2B 35c67d692f8920008758bf0b4a586c2cc711f8a819a7aea4f06e70cf7f4671ec7898701dc9dfeb6cbd84e0187ab05f4b9d77d38a2986d6474b2d44330e116a10 SHA512 5d80bd47d116199ab8138fcd53cbbc2f1ff992c6017d3e8d2c10696c7b4ad5db4a4a6b72984665309086bde791284725e8d44039838f57bd334c42208077d20e
 DIST kfind-20.12.3.tar.xz 278656 BLAKE2B d117d3eefa73d6e716818861c68b928e255a44e594d0da5ff8d05d5cb7509fbe2b6c26558fbe4dc13afa0f05a54f69802de454ebb8e902264413af7037c5b803 SHA512 e66ef911138c844ddad606b31c9075b8b0d3984315e52f95beb6f3035d8ddbf16a40bc1390d4d7ef1e93eaf27aeb4d1b1566db3db0d1b26691c8dea443b0eca9
-DIST kfind-21.04.2.tar.xz 284348 BLAKE2B 017d47e8f2e973fce52642e5846a43f8e969c943740feaca068f0222adff13ab36f580064826eaa4977424093ba7cd8ff24d0d04302a826add878dd3310c24f2 SHA512 cf570904e2b93cd138594b07d60f85f83ac1d3d921522e909146fd03115211c2d6200bfd5f146a44dbca55e8b1232c44df0273d23b20b237454a7a036bfa5bbc
 DIST kfind-21.04.3.tar.xz 284312 BLAKE2B dedca9757ccde97cc3446c73fa0acbf53303edd2f03be0ef236d12c833a10eb0a19bf138d209e85a8d1c50872bfb848758114f73f5da2e613c38b60a776ec1f5 SHA512 bfb985228e7fd96f6c88dff8792e64a1ccf9e999155acfce76de6cb434b02aab92bcb4c8473399a9de59049138809149f33b423bc46d47abc8b7ea4966bfd61c
 EBUILD kfind-20.12.3.ebuild 966 BLAKE2B 15bbf8cf4df3354d6088b90c11dbf19f38b13f755e9908ba351bb90e173814db02fc7b97bf4a5e6c90fa80682ab749774f9d4ad5075d20c00ce6e1f647e98bc7 SHA512 58a8a656963a400bcd6c6920024e0d69f73a0b98e284c9cc7a9e61605c40a6a6de799bdfe7c928045fab66017a27b078b3d9cb0abad0e47b3091999c9f45be1d
-EBUILD kfind-21.04.2.ebuild 969 BLAKE2B 3cb57be3e181ce32063d08c765dfad77a1672b324a99b8f127b722c8f399fdaf17bbe6fb36b9a19982a4244ccd77d1d192954596bd77498481cede33e631c2fc SHA512 736a06e060a750fd0abd8e36fb2c85c255560eeb69949763c495962f1ea8291f80c9979318858722237113625a3761b0c26b51979ab110ae48c755da0918e106
-EBUILD kfind-21.04.3.ebuild 969 BLAKE2B 3cb57be3e181ce32063d08c765dfad77a1672b324a99b8f127b722c8f399fdaf17bbe6fb36b9a19982a4244ccd77d1d192954596bd77498481cede33e631c2fc SHA512 736a06e060a750fd0abd8e36fb2c85c255560eeb69949763c495962f1ea8291f80c9979318858722237113625a3761b0c26b51979ab110ae48c755da0918e106
+EBUILD kfind-21.04.3-r1.ebuild 1018 BLAKE2B f82afb0eff4a459cccd210a76b7d4cd94b07c819f0a61333f6087902abc23d209761ac0cc3d1ee7545b205b44ed77390e16e4df20a1a8081c88bb5adfc54b24c SHA512 2e2e756768a92b60a7ce40f39f20ac9fb4e3c4c9ab59931364e167238857906055d65e43cdf5b2725e0b5480c7895bbf878fe1f747cdcd69c7f8d75b0ae8794c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
new file mode 100644
index 000000000000..f348bf39b5d6
--- /dev/null
+++ b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
@@ -0,0 +1,272 @@
+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.04.2.ebuild b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
index d5983326c0e5..96d049f4505a 100644
--- a/kde-apps/kfind/kfind-21.04.2.ebuild
+++ b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
@@ -35,3 +35,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
diff --git a/kde-apps/kfind/kfind-21.04.3.ebuild b/kde-apps/kfind/kfind-21.04.3.ebuild
deleted file mode 100644
index d5983326c0e5..000000000000
--- a/kde-apps/kfind/kfind-21.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kfind/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"