From d04aaebf49ad8c24b1a0a09577cc8cf30d590c40 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 3 Mar 2024 12:55:45 +0100
Subject: app-text/kjots: Port to KF6, update dependencies

Upstream commits:
e78ff150c15dc97a6d68170bf816a769c1bce623
39f7ba86ad680e6479e89cb95367cd83bce86806
a0405220a4b00324be6f083d21e1ab00ab32e671
d2255572e56c3d7d5c12438400486a3783bec461

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 app-text/kjots/kjots-9999.ebuild | 53 ++++++++++++++++++++--------------------
 app-text/kjots/metadata.xml      |  4 +--
 2 files changed, 27 insertions(+), 30 deletions(-)

(limited to 'app-text')

diff --git a/app-text/kjots/kjots-9999.ebuild b/app-text/kjots/kjots-9999.ebuild
index ac9a371497..0d2b17e5b4 100644
--- a/app-text/kjots/kjots-9999.ebuild
+++ b/app-text/kjots/kjots-9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 KDE_ORG_CATEGORY="pim"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=6.0.0
+QTMIN=6.6.2
 inherit ecm kde.org
 
 DESCRIPTION="Note taking utility by KDE"
@@ -17,40 +17,39 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 fi
 
 LICENSE="GPL-2"
-SLOT="5"
+SLOT="0"
 IUSE="speech"
 
 DEPEND="
-	>=dev-libs/grantlee-5.3:5
-	dev-libs/ktextaddons:5[speech?]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-23.04.0:5
-	>=kde-apps/akonadi-notes-23.04.0:5
-	>=kde-apps/kmime-23.04.0:5
-	>=kde-apps/kontactinterface-23.04.0:5
-	>=kde-apps/kpimtextedit-23.04.0: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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-libs/ktextaddons-1.5.0:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-24.02.0:6
+	>=kde-apps/akonadi-notes-24.02.0:6
+	>=kde-apps/kmime-24.02.0:6
+	>=kde-apps/kontactinterface-24.02.0:6
+	>=kde-apps/kpimtextedit-24.02.0:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-23.04.0:5
+	!${CATEGORY}/${PN}:5
+	>=kde-apps/kdepim-runtime-24.02.0:6
 "
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package speech KF5TextEditTextToSpeech)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
 	)
 
 	ecm_src_configure
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index fa80953797..8e5041d0d9 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">pim/kjots</remote-id>
 	</upstream>
-	<use>
-		<flag name="speech">Enable text-to-speech support</flag>
-	</use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad