[gentoo-commits] repo/gentoo:master commit in: kde-apps/kcharselect/, kde-apps/kcharselect/files/

[Andreas Sturmlechner]

commit:     29a7a2204302352703d6777379220e904d0cfd64
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 09:23:40 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 06:35:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a7a220

kde-apps/kcharselect: drop 19.12.3*

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kcharselect/Manifest                      |  1 -
 .../kcharselect-19.12.3-kf5bookmarks-5.69.patch    | 50 ----------------------
 kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild | 34 ---------------
 3 files changed, 85 deletions(-)

diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index c75324813c0..19fc324744d 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,2 +1 @@
-DIST kcharselect-19.12.3.tar.xz 334996 BLAKE2B 894618ae1e3837169247a3ad4a79b9f74ef7771a19ad0d3615c52039b0f2821e7e21175dd4b9a64a7eba852b0228324b93eb51273902326da53e8891a28f55c8 SHA512 85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006
 DIST kcharselect-20.04.3.tar.xz 335620 BLAKE2B bb5aa7fe86ac2be85e84d8b3004ac0a7e9f15e77591bde7008fb1412b8df20175d2cca7d825792c504737db4a694425f0f04655314bcfaa1fb103bcd7c0895bd SHA512 f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998

diff --git a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
deleted file mode 100644
index 46d943bb037..00000000000
--- a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7972b9858bcdd2bf8cd2b09cb7e8b6c9b51dfec9 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@×××××.com>
-Date: Fri, 17 Apr 2020 21:49:00 +0200
-Subject: [KCharSelect] Adapt the code to KBookmarks-5.69 changes
-
-Test Plan:
-The Bookmarks menu has the usual entries, and the bookmark actions are
-displayed in the configure shortcuts dialog.
-
-Reviewers: cfeck
-
-Reviewed By: cfeck
-
-Subscribers: asturmlechner, kde-utils-devel
-
-Differential Revision: https://phabricator.kde.org/D28927
----
- kcharselectdia.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/kcharselectdia.cc b/kcharselectdia.cc
-index 116cba4..37ef894 100644
---- a/kcharselectdia.cc
-+++ b/kcharselectdia.cc
-@@ -27,6 +27,7 @@
- #include <QMenu>
- 
- #include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkManager>
- #include <KBookmarkMenu>
- #include <KConfigGroup>
-@@ -185,7 +186,14 @@ KCharSelectDia::KCharSelectDia()
-   action->setText(i18n("Bookmarks"));
-   QMenu *bmmenu = new QMenu(this);
-   action->setMenu(bmmenu);
-+
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-   KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu, actionCollection());
-+#else
-+  KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu);
-+  actionCollection()->addActions(bmmenu->actions());
-+#endif
-+
-   bm->setParent(this);
- 
-   setupGUI(ToolBar|Keys|Save|Create);
--- 
-cgit v1.1
-

diff --git a/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild b/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild
deleted file mode 100644
index c4875ac0788..00000000000
--- a/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcharselect
-https://utils.kde.org/projects/kcharselect/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# drop kbookmarks subslot operator when KFMIN >= 5.69.0
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" )