gentoo resync : 25.04.2020

4 files changed, 119 insertions, 0 deletions

diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 22b22ca14cb2..bb05e53d4e20 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,3 +1,7 @@
+AUX kcharselect-19.12.3-kf5bookmarks-5.69.patch 1438 BLAKE2B 35ac0e002594fe44f538f234deb5db12a10ce4ef2b1d68970b7793dc625f5c3d0ab146a20f45a75b84e6559f78147843e634bbb0282bb591c33c786e286f660e SHA512 22ab35f9bdd112c296f654dc231078461c90a17398d351cbf0e8b56565339f52da4ac5921f543eef8ef8ae01352cd5409d4fe7f783b5fa71c7a7539fa67819ab
 DIST kcharselect-19.12.3.tar.xz 334996 BLAKE2B 894618ae1e3837169247a3ad4a79b9f74ef7771a19ad0d3615c52039b0f2821e7e21175dd4b9a64a7eba852b0228324b93eb51273902326da53e8891a28f55c8 SHA512 85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006
+DIST kcharselect-20.04.0.tar.xz 335664 BLAKE2B ce01cb9763c6811bef1c4f1c1ef07f707a081f7f3544ce33ef684689fe93c109630d07a76540cf96e013e728dfd4295515c3fbe449cb48934d308a26feb0835d SHA512 51964a3d1358aaaecbabc92a4d9fdc1b76eb707a5dc45f8db3862ddcb5746ee15993b7a794b36f83f09784f4a7d5400101cc7f07ed4ca9d1d125172ab8b4fc00
+EBUILD kcharselect-19.12.3-r1.ebuild 915 BLAKE2B 9fd6856d095fc76dde13c291085ae425c01807c3bc7c0628ab8d40509265917e87745cbe44be4c2454af5b5fbaad56b3f26d08dda6ff24ff402bfaf040e95a53 SHA512 c5c81cb2f777bae6f0ef542ae7cc05780c141d19770c4813e51a5efaf49b0b632a9c787c701d149f82b498687c4535231bc1213b4664479280370e2850170738
 EBUILD kcharselect-19.12.3.ebuild 799 BLAKE2B 9e0a7bd44b22b170d8b2f0d7c8f3b58b3891c9b4f93d6181228a1b86608d6eed023ffca3b09047e51181f4f0361486b2a0cdb1100b4729839581a403dcdeec94 SHA512 c84b5885133679e38b23eeacb2fde03349e0a6ec33e9a9d08728eeb0ed931ef7dfce402df498281fca0d8222a02b18cbf66da793f090d17e61bed3933e0ebd7c
+EBUILD kcharselect-20.04.0.ebuild 790 BLAKE2B d4e6f666723650fd28b96d2215ccdbd31672052fc408ac23deddff3e2c3327334d45cb0d584e00d86378b89d773e24eef35bc10597020cf85a461d4ece47ab9b SHA512 91c30f28c89d483747e80986b4777e1d9020135aa1a116a228be08d170a859f57331c9131af9993729718956b5f08a04df96d2fc0d9c06f9094d079e6e8dd516
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
new file mode 100644
index 000000000000..46d943bb0372
--- /dev/null
+++ b/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,50 @@
+From 7972b9858bcdd2bf8cd2b09cb7e8b6c9b51dfec9 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.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
new file mode 100644
index 000000000000..552741cdfb6d
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild
@@ -0,0 +1,34 @@
+# 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" )
diff --git a/kde-apps/kcharselect/kcharselect-20.04.0.ebuild b/kde-apps/kcharselect/kcharselect-20.04.0.ebuild
new file mode 100644
index 000000000000..f6c18e9eddb6
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-20.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.69.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 ~ppc64"
+IUSE=""
+
+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}"