gentoo resync : 28.04.2021

4 files changed, 0 insertions, 268 deletions

diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index fe4c4f51221f..c7f3dcf09e84 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,8 +1,4 @@
-AUX kjots-5.0.2-kf5bookmarks-5.69.patch 2734 BLAKE2B 5bbad18ee50f844320a405347eb6f89535b831d42b4751c56d7227e31095dbf0767fff15ea5fe3930bb11a13155bd13db6f9b970be86aee011c0929efaa7dbfe SHA512 13aff021919d8565cce1c6e7c84cdf23e9a405394374451325f229a00ce5d36be070c0efb0726573297a615d709e0a7d1bd60cb5f1e7752aaee50d8021b64fef
-AUX kjots-5.0.2-kontactinterface-20.08.patch 5563 BLAKE2B 2c754b4a31c133c4fe9409e930df855366d0276a35678466b07b4fd54736c1ec64bdac6b3064bceb5044765433f6d953239746e580f4ef150ad274e111829001 SHA512 0fd6cfaaaac12bac57043acec043ad4fabb232a2df666379860b745b6d137e18193abd6447dca60a51596cfa969f4193bafc33d811bf793b547df43efb462026
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
-DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.0.2-r2.ebuild 1343 BLAKE2B ac83e67d01b3375519a0075f776b44c9cd6a4b81a7b5c28f24dd34a91613a92d89aac13b797a6f8a1fe1084389017ee38910c6d1680fb186008692c9d1c5b88e SHA512 50fc1c301a15794f5a14accb24b22f996c94fc364431d41fce024b5b7f342763b797012a058c1cb90c0ff2bff5047b872c7d01979f839234a2713d69893ce4a6
 EBUILD kjots-5.1.0.ebuild 1283 BLAKE2B 5d001a7d9f3bebd982ab6a4eef595a3f17f675c479863f04d57064fb220358f646608553ac2d6cfd501b09909ad1864916a09c238b6f774d47bef0dab10cc077 SHA512 1e7d7cfc3239c4ee568478697e9140f3e7ab6e0aac2e79aa826f0496881a6e3f2b21baf9c0f29e7360e983e9bb56a10bcad9ad8d6dc975bf02e0065a244b7db8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch b/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
deleted file mode 100644
index 63bda683122f..000000000000
--- a/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ca6f4b963e83ed91cc7314e1b60fe6607b61b53e Mon Sep 17 00:00:00 2001
-From: Igor Poboiko <igor.poboiko@gmail.com>
-Date: Sun, 12 Apr 2020 17:55:24 +0300
-Subject: [KJots] Fix bookmarks actions
-
-Summary:
-This patch ports KJots from deprecated `KBookmarksMenu` API (see {D25660}).
-
-On my machine, it also fixes a crash (`bm_action` was null for some reason,
-I did not investigate it though).
-
-It also fixes the shortcuts collision (`action->setShortcut` was not enough,
-one also needs to run `actionCollection->setDefaultShortcut`).
-
-BUG: 384000
-
-Test Plan:
-1) Start KJots
-2) It don't crash, and `Ambiguous shortcuts` dialog does not appear)
-3) Open `Bookmarks` menu, the shortcut is `Ctrl+Shift+B`.
-
-Reviewers: dvratil
-
-Reviewed By: dvratil
-
-Subscribers: winterz, kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D28775
----
- src/kjotswidget.cpp | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
-index 865129b..e343bbd 100644
---- a/src/kjotswidget.cpp
-+++ b/src/kjotswidget.cpp
-@@ -353,17 +353,20 @@ KJotsWidget::KJotsWidget(QWidget *parent, KXMLGUIClient *xmlGuiClient, Qt::Windo
-     bookmarkMenu = actionCollection->add<KActionMenu>(QLatin1String("bookmarks"));
-     bookmarkMenu->setText(i18n("&Bookmarks"));
-     KJotsBookmarks *bookmarks = new KJotsBookmarks(treeview);
--    /*KBookmarkMenu *bmm =*/ new KBookmarkMenu(
-+    KBookmarkMenu *bmm = new KBookmarkMenu(
-         KBookmarkManager::managerForFile(
-             QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).first() + QStringLiteral("/kjots/bookmarks.xml"),
-             QStringLiteral("kjots")),
--        bookmarks, bookmarkMenu->menu(), actionCollection);
-+        bookmarks, bookmarkMenu->menu());
- 
-     // "Add bookmark" and "make text bold" actions have conflicting shortcuts (ctrl + b)
-     // Make add_bookmark use ctrl+shift+b to resolve that.
--    QAction *bm_action = qobject_cast<QAction *>(actionCollection->action(QLatin1String("add_bookmark")));
--    Q_ASSERT(bm_action);
--    bm_action->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B);
-+    QAction *bm_action = bmm->addBookmarkAction();
-+    actionCollection->addAction(QStringLiteral("add_bookmark"), bm_action);
-+    actionCollection->setDefaultShortcut(bm_action, Qt::CTRL | Qt::SHIFT | Qt::Key_B);
-+    actionCollection->addAction(QStringLiteral("edit_bookmark"), bmm->editBookmarksAction());
-+    actionCollection->addAction(QStringLiteral("add_bookmarks_list"), bmm->bookmarkTabsAsFolderAction());
-+
- 
-     KStandardAction::find(this, SLOT(onShowSearch()), actionCollection);
-     action = KStandardAction::findNext(this, SLOT(onRepeatSearch()), actionCollection);
--- 
-cgit v1.1
-
diff --git a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
deleted file mode 100644
index 608a50d98567..000000000000
--- a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Fri, 24 Apr 2020 01:25:43 +0200
-Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
-
-Summary: This will allow kontact to use KPluginLoader one day.
-
-It also fixes compilation with current kontactinterface API.
-
-Test Plan:
-rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
-kontact still finds the zanshin plugin
-
-The same steps (other than old-kontact-interface compatibility) were already
-pushed to all other kontact plugins.
-
-This commit is very similar to https://phabricator.kde.org/D28847
-and its predecessor commit, in zanshin.
----
- src/kontact_plugin/CMakeLists.txt      | 11 ++++++++-
- src/kontact_plugin/kjots_plugin.cpp    | 34 ++++++++++++++++++++------
- src/kontact_plugin/kjots_plugin.h      |  5 ++++
- src/kontact_plugin/kjotsplugin.desktop |  2 +-
- 4 files changed, 43 insertions(+), 9 deletions(-)
-
-diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
-index 8a6b5e1..dec4b8b 100644
---- a/src/kontact_plugin/CMakeLists.txt
-+++ b/src/kontact_plugin/CMakeLists.txt
-@@ -1,13 +1,22 @@
- include_directories(${kjots_SOURCE_DIR}/src)
- 
-+# TODO: remove once kontactinterface 5.14.42 is required
-+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-+  # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
-+  # 3.10+ lets us provide more macro names that require automoc.
-+  # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
-+  list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
-+endif()
-+
- set(kontact_kjots_PART_SRCS
-     kjots_plugin.cpp
- )
- 
- add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
- target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
-+kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
- 
--install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-+install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
- install(FILES kjotsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
- install(FILES kjots.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
- 
-diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp
-index 66e7ed5..b74d601 100644
---- a/src/kontact_plugin/kjots_plugin.cpp
-+++ b/src/kontact_plugin/kjots_plugin.cpp
-@@ -33,7 +33,25 @@
- #include <QIcon>
- #include <QStandardPaths>
- 
--EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots)
-+#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
-+/**
-+  Exports Kontact plugin.
-+  @param pluginclass the class to instanciate (must derive from KontactInterface::Plugin
-+  @param jsonFile filename of the JSON file, generated from a .desktop file
-+ */
-+#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
-+    class Instance                                           \
-+    {                                                        \
-+    public:                                                \
-+        static QObject *createInstance( QWidget *, QObject *parent, const QVariantList &list ) \
-+        { return new pluginclass( static_cast<KontactInterface::Core*>( parent ), list ); } \
-+    };                                                                    \
-+    K_PLUGIN_FACTORY_WITH_JSON( KontactPluginFactory, jsonFile, registerPlugin< pluginclass >   \
-+                              ( QString(), Instance::createInstance ); ) \
-+    K_EXPORT_PLUGIN_VERSION(KONTACT_PLUGIN_VERSION)
-+#endif
-+
-+EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
- 
- KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &)
-     : KontactInterface::Plugin(core, core, "kjots")
-@@ -63,15 +81,17 @@ QStringList KJotsPlugin::invisibleToolbarActions() const
-     return { QStringLiteral("new_page"), QStringLiteral("new_book") };
- }
- 
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+KParts::Part *KJotsPlugin::createPart()
-+{
-+    return loadPart();
-+}
-+#else
- KParts::ReadOnlyPart *KJotsPlugin::createPart()
- {
--    KParts::ReadOnlyPart *part = loadPart();
--    if (!part) {
--        return Q_NULLPTR;
--    }
--
--    return part;
-+    return loadPart();
- }
-+#endif
- 
- QStringList KJotsPlugin::configModules() const
- {
-diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h
-index cd62373..4945d25 100644
---- a/src/kontact_plugin/kjots_plugin.h
-+++ b/src/kontact_plugin/kjots_plugin.h
-@@ -24,6 +24,7 @@
- #define KJOTS_PLUGIN_H
- 
- #include <KontactInterface/UniqueAppHandler>
-+#include <kontactinterface_version.h>
- 
- namespace KontactInterface
- {
-@@ -62,7 +63,11 @@ public:
-     QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE;
- 
- protected:
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+    KParts::Part *createPart() override;
-+#else
-     KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE;
-+#endif
-     KontactInterface::UniqueAppWatcher *mUniqueAppWatcher;
- 
- private:
-diff --git a/src/kontact_plugin/kjotsplugin.desktop b/src/kontact_plugin/kjotsplugin.desktop
-index 1339753..d5a198f 100644
---- a/src/kontact_plugin/kjotsplugin.desktop
-+++ b/src/kontact_plugin/kjotsplugin.desktop
-@@ -3,7 +3,7 @@ Type=Service
- Icon=kjots
- X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
- 
--X-KDE-Library=kontact_kjotsplugin
-+X-KDE-Library=kontact5/kontact_kjotsplugin
- X-KDE-KontactPluginVersion=10
- X-KDE-KontactPartLibraryName=kjotspart
- X-KDE-KontactPartExecutableName=kjots
--- 
-GitLab
-
diff --git a/app-text/kjots/kjots-5.0.2-r2.ebuild b/app-text/kjots/kjots-5.0.2-r2.ebuild
deleted file mode 100644
index 07aaf94d7b1c..000000000000
--- a/app-text/kjots/kjots-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-20.08.1:5
-	>=kde-apps/akonadi-notes-20.08.1:5
-	>=kde-apps/kmime-20.08.1:5
-	>=kde-apps/kontactinterface-20.08.1:5
-	>=kde-apps/kpimtextedit-20.08.1:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES+=(
-	"${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 384000
-	"${FILESDIR}/${P}-kontactinterface-20.08.patch"
-)