gentoo resync : 29.01.2021

14 files changed, 225 insertions, 177 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 133258e43d83..a0f0bf37daea 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5a9050b3c8f7..d002c732bc60 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-20.12.1-knetattach-button.patch 8072 BLAKE2B 97735000237dd7a27f2d78d889dddc70f77067bfefa04999a36b7626b866c226057268a5e04f7ef40b203cf72b39eb4589d3bebc16a93a4ae2ff311367f815bd SHA512 acd2f6414c28a4db1ec01dfa8532246caddd1c3ce77afa3e72270122972f608c66f09923495e9d68ec29199663c0a52f260d07603cefb084ad4a66c30d8d1e92
 DIST dolphin-20.08.3.tar.xz 5094964 BLAKE2B 368eca6e1972361bdb02bb3b1d3b449074d7d48af7bb88df60447ac9a7c88e8562fcac185c96596c57520df3efb87859cd21ad19e3b8515ec4ce40ebc7d2b3a5 SHA512 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c
 DIST dolphin-20.12.1.tar.xz 5115268 BLAKE2B 12f0d39eda33615401858e9ea2f5ded1ec3b8308766dfc1c05d19bb9fd32f84ed8db808ae7035cebcbbd52ef9fe4def163574690a128a20052588ccb0bf76bd8 SHA512 a9f04b1dce709afebde3c60e356750ae2e6b32209cf9251845a348594047eeca1c98942de6125d9b4eaa1db596fc598ef9467185072d220c430e1499f5ef56e8
 EBUILD dolphin-20.08.3.ebuild 3065 BLAKE2B d935f22318e5aa0dfdc22ba1f6dc9b6c9a79bd8e19509c75e918c7ee6855e8fabc55351d5e8bb0e01f349d305c448cafbee77fb6aaceef4e7afdd1c25892af39 SHA512 e78165d126936b7b1e324e3cbdc57f6af5632d27f3c9ed6be3a742d60a71c1edcf2949c78fa4ecf50c8661b841ac8a80fc80bd754e1c1a8d35cdb4b2e3afd3c3
-EBUILD dolphin-20.12.1.ebuild 3171 BLAKE2B 25ecb306c472a6b38563d478955cf9ece27b4195a1d7e1f7f985a34d4a8fb923d24392830d3fcd487990e1dc6bf7f237f261a2e178eb19664f4115ba2390f6c2 SHA512 92847a5f733306139a57db78d07ab168fdc2d914b01848a338020702e9ea288be1553fbfe3f90b6ab5e555f404acf43390ad2dd95e0aef05a3aaf259ba8b0717
+EBUILD dolphin-20.12.1-r1.ebuild 3245 BLAKE2B 02e730cff7fb9efde24d9556967abf7f451a0e91279b528b3a28b7fe4d5bffef26f27d50e965c85c7f803d591c828554bc15110629c2d8d4ea2c06caeaadf297 SHA512 2cbf076a35706ebb4d387df8e298b0a08e328753b02922af9fffb6417f7621263bd22ae0a6c6ac681caf79c0bdb48d5287b83e9721abc5081b7f5c857f73ee22
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.12.1.ebuild b/kde-apps/dolphin/dolphin-20.12.1-r1.ebuild
index af47c4290036..0fbdb6a75231 100644
--- a/kde-apps/dolphin/dolphin-20.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.1-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5=
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-knetattach-button.patch" ) # KDE-Bug 431626
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-20.12.1-knetattach-button.patch b/kde-apps/dolphin/files/dolphin-20.12.1-knetattach-button.patch
new file mode 100644
index 000000000000..b66b6c7e0344
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.1-knetattach-button.patch
@@ -0,0 +1,193 @@
+From 33270dd4423eea329b8f20db17f8d70ab7b108da Mon Sep 17 00:00:00 2001
+From: Norbert Preining <norbert@preining.info>
+Date: Tue, 19 Jan 2021 06:43:14 +0900
+Subject: [PATCH] Show button to open knetattach inline with URL nav on
+ remove:// view
+
+This is a backport of b1cadeba939155282a9fadf7d7b025d6529c489e
+
+  From b1cadeba939155282a9fadf7d7b025d6529c489e Mon Sep 17 00:00:00 2001
+  From: Nate Graham <nate@kde.org>
+  Date: Tue, 15 Dec 2020 23:03:00 -0700
+  Subject: [PATCH] Show button to open knetattach inline with URL nav on
+   Remote:// view
+
+  In conjunction with
+  https://invent.kde.org/frameworks/kio/-/merge_requests/260,
+  the net result is to hide the knetattach launcher in the view, and show
+  it inline with Dolphin's URL navigator toolbar when viewing the
+  remote:// view, just like how we add an "Empty Trash" button when
+  viewing trash://.
+
+The backport ensures that even with frameworks << 5.78 only one network
+button is shown.
+
+BUG: 431626
+---
+ src/dolphinnavigatorswidgetaction.cpp | 61 +++++++++++++++++++++++++++
+ src/dolphinnavigatorswidgetaction.h   | 20 ++++++++-
+ 2 files changed, 80 insertions(+), 1 deletion(-)
+
+diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
+index b8c77c69b..b25c60d0c 100644
+--- a/src/dolphinnavigatorswidgetaction.cpp
++++ b/src/dolphinnavigatorswidgetaction.cpp
+@@ -10,9 +10,13 @@
+ #include "trash/dolphintrash.h"
+ 
+ #include <KLocalizedString>
++#include <KNotificationJobUiDelegate>
++#include <KService>
+ #include <KXMLGUIFactory>
+ #include <KXmlGuiWindow>
+ 
++#include <KIO/ApplicationLauncherJob>
++
+ #include <QApplication>
+ #include <QDomDocument>
+ #include <QHBoxLayout>
+@@ -154,7 +158,13 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
+     }
+     int trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
+                           - (m_globalXOfPrimary + m_widthOfPrimary);
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+     if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()) {
++#else
++    if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()
++                            || networkFolderButton(Primary)->isVisible()
++    ) {
++#endif
+         trailingSpacing = 0;
+     }
+     const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing;
+@@ -181,7 +191,13 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
+ 
+     trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
+                       - (m_globalXOfSecondary + m_widthOfSecondary);
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+     if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()) {
++#else
++    if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()
++                            || networkFolderButton(Secondary)->isVisible()
++    ) {
++#endif
+         trailingSpacing = 0;
+     } else {
+         const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing;
+@@ -212,6 +228,11 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
+     auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget);
+     layout->addWidget(emptyTrashButton);
+ 
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++    auto networkFolderButton = newNetworkFolderButton(urlNavigator, navigatorWidget);
++    layout->addWidget(networkFolderButton);
++#endif
++
+     connect(urlNavigator, &KUrlNavigator::urlChanged, this, [this]() {
+         // We have to wait for DolphinUrlNavigator::sizeHint() to update which
+         // happens a little bit later than when urlChanged is emitted.
+@@ -249,6 +270,38 @@ QPushButton *DolphinNavigatorsWidgetAction::newEmptyTrashButton(const DolphinUrl
+     return emptyTrashButton;
+ }
+ 
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigatorsWidgetAction::Side side)
++{
++    int sideIndex = (side == Primary ? 0 : 1);
++    if (side == Primary) {
++        return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget());
++    }
++    return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget());
++}
++
++QPushButton *DolphinNavigatorsWidgetAction::newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const
++{
++    auto networkFolderButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-add")),
++                                        i18nc("@action:button", "Add Network Folder"), parent);
++    networkFolderButton->setFlat(true);
++    connect(networkFolderButton, &QPushButton::clicked,
++            this, [networkFolderButton]() {
++                KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach"));
++                auto *job = new KIO::ApplicationLauncherJob(service, networkFolderButton);
++                auto *delegate = new KNotificationJobUiDelegate;
++                delegate->setAutoErrorHandlingEnabled(true);
++                job->setUiDelegate(delegate);
++                job->start();
++            });
++    networkFolderButton->hide();
++    connect(urlNavigator, &KUrlNavigator::urlChanged, this, [networkFolderButton, urlNavigator]() {
++        networkFolderButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("remote"));
++    });
++    return networkFolderButton;
++}
++#endif
++
+ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) const
+ {
+     int sideIndex = (side == Primary ? 0 : 1);
+@@ -257,9 +310,17 @@ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) co
+         return m_splitter->widget(sideIndex)->layout()->itemAt(0)->widget();
+     }
+     if (side == Primary) {
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+         return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
++#else
++        return m_splitter->widget(sideIndex)->layout()->itemAt(4)->widget();
++#endif
+     }
++#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
+     return m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget();
++#else
++    return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
++#endif
+ }
+ 
+ void DolphinNavigatorsWidgetAction::updateText()
+diff --git a/src/dolphinnavigatorswidgetaction.h b/src/dolphinnavigatorswidgetaction.h
+index bbd8cf127..ce199b3f0 100644
+--- a/src/dolphinnavigatorswidgetaction.h
++++ b/src/dolphinnavigatorswidgetaction.h
+@@ -10,6 +10,7 @@
+ 
+ #include "dolphinurlnavigator.h"
+ 
++#include <kio_version.h>
+ #include <QSplitter>
+ #include <QTimer>
+ #include <QWidgetAction>
+@@ -30,7 +31,8 @@ class QPushButton;
+  *      The secondary side only exists for split view and is created by
+  *      createSecondaryUrlNavigator() when necessary.
+  * - Each side is a QWidget which I call NavigatorWidget with a QHBoxLayout.
+- * - Each NavigatorWidget consists an UrlNavigator, an emptyTrashButton and spacing.
++ * - Each NavigatorWidget consists an UrlNavigator, an emptyTrashButton, a
++ *   networkFolderButton (for frameworks >= 5.78), and spacing.
+  * - Only the primary navigatorWidget has leading spacing. Both have trailing spacing.
+  *      The spacing is there to align the UrlNavigator with its DolphinViewContainer.
+  */
+@@ -131,6 +133,22 @@ private:
+      */
+     QPushButton *newEmptyTrashButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const;
+ 
++#if !(KIO_VERSION < QT_VERSION_CHECK(5, 78, 0))
++    /**
++     * Used to retrieve the networkFolderButtons for the navigatorWidgets on
++     * both sides.
++     */
++    QPushButton *networkFolderButton(Side side);
++
++    /**
++     * Creates a new add "network folder" button.
++     * @param urlNavigator Only when this UrlNavigator shows the remote directory
++     *                     will the button be visible.
++     * @param parent       The object that should be the button's parent.
++     */
++    QPushButton *newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const;
++#endif
++
+     enum Position {
+         Leading,
+         Trailing
+-- 
+GitLab
+
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
deleted file mode 100644
index 99271daab5bb..000000000000
--- a/kde-apps/ktp-call-ui/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ktp-call-ui-20.08.3.tar.xz 97240 BLAKE2B 0b3b7250494f29c381fe83073ee84edab8fc39c9cbf0c4046a74e917ed2ad89a23c48a8bdee7fa8d877e3241d18642e82c2f41fefa4d729b842d901f40972ee8 SHA512 02b14bf994b8e016c28ef8ba4e86f12f50ae0db68eadf3a9a3f2630314b9fe366f629c488fd4a5a06360cdd21c77ef5020d54569180dbe75c6ffedbebc3f1878
-DIST ktp-call-ui-20.12.1.tar.xz 97256 BLAKE2B ad4fd2f2428142b03522ebcc616c9ea69b5dabd9ba78f277b6b14bb066fa10805773b2f52ce5db35f41de56683748b64e387782c370ad2406a499de4426fa630 SHA512 6d0fd6c8b7e4ca851b5d29d2f6ffe12f081000fded58c487600e1ac19ee6a1d36447aef9dc10f00ed81d9692550e4bbdf9c03e25ee905545ad4a35a2db6a6d55
-EBUILD ktp-call-ui-20.08.3.ebuild 1184 BLAKE2B 9e949f88ac34b54ca07fc1988d84338052ee6403938c2e6bf26f5b6bfcbaec21e9632c26a81a719826e1e93d8acbc7abb1113952e45570454ce549337b7d1f0a SHA512 c339b7e0e377a21d25553e356d410e0c546a6f95d6a259919573e012827148e892cb701fb6c88b9ceae0cbcaa4e91793f7bc8e7ea2c4c94e505193c960e78905
-EBUILD ktp-call-ui-20.12.1.ebuild 1187 BLAKE2B 8b4fc2da4215ff81d57d00241808515f4f339e72ad9cbefd32d61c830a7d3517eef7592d909074c7703764286293fd9cc42c107364725bd349af5f931631573f SHA512 681721bfc84ae24286d37e0396b54f52d69a514d744c919b2979637b8da117b738121c9ccbffb29fb5666476fc8469368aa02c118ddb905fd0a21be9907609a1
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-20.08.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-20.08.3.ebuild
deleted file mode 100644
index 05fef1dbedc7..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy audio/video conferencing UI"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	>=media-libs/qt-gstreamer-1.2.0-r4
-	net-libs/farstream:0.2
-	net-libs/telepathy-farstream
-	>=net-libs/telepathy-qt-0.9.8[farstream]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-20.12.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-20.12.1.ebuild
deleted file mode 100644
index 97399e8ad639..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-20.12.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy audio/video conferencing UI"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	>=media-libs/qt-gstreamer-1.2.0-r4
-	net-libs/farstream:0.2
-	net-libs/telepathy-farstream
-	>=net-libs/telepathy-qt-0.9.8[farstream]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-call-ui/metadata.xml b/kde-apps/ktp-call-ui/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-apps/ktp-call-ui/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 18feaf812437..c3d2b8429503 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-20.08.3.tar.xz 8842444 BLAKE2B e3d2d9552384baab9734700da7a5bff4d5a24d23e1cfdcb4659ecdedcad22fa4bc26ec86d8666d47ae15af3349dc06f80c61880a96c47d17e709c8d81414afd3 SHA512 b7d2f9fa4534a5e5749028f54b0374a271e0b443b4be6a7c905f16542553c02eb661928b25bc373cf9f556cf09c2ea88b4adbfd535df32181ee6c0ccaf16619f
 DIST parley-20.12.1.tar.xz 8842148 BLAKE2B 4960650c0687f24d7292df8b34172ddd2a51961624820c684053ad8d28467a9aa6527b8e31b7fbf1d6bd6659b3aa78493da4df17694a4f8e981c67b26fe0a75a SHA512 19ecf6999f189b4dabdab81e046e402a5cc836ff2ed32b49e0ab7f7be87304e88e66dcefb40ab21a7b60bdd9eab0778a18a69b2f49400b34b85c1b5e0f8d5e52
-EBUILD parley-20.08.3.ebuild 1405 BLAKE2B 573d86389d2374d68b99769442dc6d0e5aacd6ab078af15f865e414b989cbc18a9ee3c03050a71693a198403e2af70a47fa0a39a5f49e909d600946f8890eac3 SHA512 06a9d8055abfdbf9f41953120641e761b42ed2f646f7e252864e9a0a437cb21110676fa8a2f0bc80ccd03e5611a4692b97894d662281fffbf16dff0e9598ce70
-EBUILD parley-20.12.1.ebuild 1408 BLAKE2B b7d113a80e60827af9a1cd54fd0602fd0fe265136e6995c0e878ae4c922f26e031899c86e6e296a370f5390cd6fccdc05fcda573bd7eff1e1bd31c29aa222d13 SHA512 63d4f363aff1bd2c6dfe8269f5159f64021ac4ab80079f05e64e92828fd376618322e1e708468c76d407b1c4011aab67265d663866a23285811f2d997751b2e2
+EBUILD parley-20.08.3-r1.ebuild 1634 BLAKE2B 0926cd4e573e0f43439f45e573335d87ccdb659d9e502a293401ec941c4c3edc5e53a119211e877d088f0b41659c497d9dc25b53a5e11601c84ec7574fea4fc2 SHA512 c8bb754229c6f4be8a8f0d9cc243439dc138eb3afc0f52f8f6d557c0cbd0e8a3220f190ff9ca7443b1419b4f7ffc68fb99317adfd1d8773efe6d59cdeedc2b6c
+EBUILD parley-20.12.1-r1.ebuild 1637 BLAKE2B b4c5702809091eb1ebd18336373239f80d56ffc9c9614dea187751553c5bac5890eedc838d03877f90e534e217d6d01bd48d522f78a606adc04acca08280ff39 SHA512 70dade0d848ffe737f5790d804a40a849849eecab707c19c18f7e8f0843147484e0b85c1544be2b90af68e885590b891ca1e0ed4680300f67ac1fd39acbec867
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-20.08.3.ebuild b/kde-apps/parley/parley-20.08.3-r1.ebuild
index 01011f306298..7cb545fab6b2 100644
--- a/kde-apps/parley/parley-20.08.3.ebuild
+++ b/kde-apps/parley/parley-20.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,3 +49,14 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-apps/kdeedu-data-${PVCUT}:5
 "
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory plugins
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Plugins are disabled in Gentoo due to lack of Python-3 compatible"
+	elog "kross-interpreters, bug #766333."
+}
diff --git a/kde-apps/parley/parley-20.12.1.ebuild b/kde-apps/parley/parley-20.12.1-r1.ebuild
index 226d129256a9..588f0be5fbb3 100644
--- a/kde-apps/parley/parley-20.12.1.ebuild
+++ b/kde-apps/parley/parley-20.12.1-r1.ebuild
@@ -49,3 +49,14 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-apps/kdeedu-data-${PVCUT}:5
 "
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory plugins
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Plugins are disabled in Gentoo due to lack of Python-3 compatible"
+	elog "kross-interpreters, bug #766333."
+}
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index beaac4733f73..456e8985633e 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,5 @@
 DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
 DIST spectacle-20.12.1.tar.xz 1163912 BLAKE2B 5ba6ff90e9f98a711eaf99b04f4bc6799a1bedf7c91c836657b51fb204cb7607ea219fc9c6b2c343b4c21ac980d42be3094e409833e81c0e1db4fa5f15cd169a SHA512 7df1907ed350d19d48e522c7a591e3d4464a60d18b9f88242713062ea9a68aa966221fd2e6c3548cf0cc325fa7a7e9ec0c3d9856edf95c2cdcf74b950f10ba60
 EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.1-r1.ebuild 1963 BLAKE2B 11612be512cdf9724b2a0667e3895aca86e5dfda6659e767691cafe506ea9479ab3e9fb99110d56f2f4a0beea19e14d5e773d6c9b16e2569f72de08782fb7e3f SHA512 34bdb2250583436f0fb9c8bc3703ba58c26aaf08216b820902b7083c9de78e624a8c06410520f19f05a598705650661cfbcd4b23574e2af5f21dfd5e74bb0db5
-EBUILD spectacle-20.12.1.ebuild 1713 BLAKE2B 39009bd94ddb6fe01e947be5c9d7b701794214b82d4034761918ade0f808b23bce8f43febc45f834ced80088be6d7385145d80bbe645f95bf16a73edc7c84b38 SHA512 c15a8e2238f9bb445c404e627aecacbf7d3106a4888dbe1cd547a70ebd01c6238994bbda443f79085495f0a9d274ae422468798d32d577f4293e1efd7561c8e3
+EBUILD spectacle-20.12.1-r1.ebuild 1970 BLAKE2B 8e34a6da506d489d5aa48770d2c920538e5ae560c4b5e2707dd64fa565a733c4a64ad1c4000fe4ff34e116e89f1ecf1011fdffea3db2efa5e09c03f0deaea77a SHA512 5379b550fab1d17f9da9bd86c868a57fad79a38b15bbee0a2d04538c1d7ac7975af30f91eb886fab2f7fc641ae7751112a990725717007d57ebc3b83112e5740
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
index 3fc21616ca70..274f36a9b8f7 100644
--- a/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-20.12.1.ebuild b/kde-apps/spectacle/spectacle-20.12.1.ebuild
deleted file mode 100644
index 55b8590a0d7d..000000000000
--- a/kde-apps/spectacle/spectacle-20.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://apps.kde.org/en/spectacle"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kipi share"
-
-# TODO: mv guru.git -> gentoo.git
-# IUSE+=" annotate"
-# DEPEND+="
-# 	dev-qt/qtsvg-${QTMIN}:5
-# 	x11-libs/kimageannotator
-# "
-
-DEPEND="
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}