[gentoo-commits] proj/kde:master commit in: kde-apps/artikulate/, eclass/

[gentoo-commits] proj/kde:master commit in: kde-apps/artikulate/, eclass/

[Andreas Sturmlechner]

commit:     1db2ebf3048889a3e962f81af60a93a6ed7b275f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 25 16:22:01 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 25 16:24:48 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1db2ebf3

kde-apps/artikulate: Port to Qt6

Upstream commits:
13f44b64a3e16345a88c8bda9ce1786c5b45b638
bebf6138a41f7294be701d4a620c2e0b6ece2d03
2a3be7150b5cca51e142557ba12b63648b9ae371
3c1f3330fa3010d1edf765bf88d7f30f384be07b
27fb25baa29353b7a0bb5fdba877cb4367f0d432
05cb22e0ebaa27d41541394f66ba83491efa89b1

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

 eclass/gear.kde.org.eclass                 | 18 +++++++++----
 kde-apps/artikulate/artikulate-9999.ebuild | 42 ++++++++++++++----------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index ee9e182799..9926068ab6 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -63,7 +63,7 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
 	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
 fi
 
-# list of applications ported to KF6 in SLOT=6 having to block SLOT=5
+# list of applications ported to KF6 having to block SLOT=5
 if $(ver_test -gt 24.01.75); then
 	case ${PN} in
 		akonadi | \
@@ -248,7 +248,7 @@ if $(ver_test -gt 24.01.75); then
 	esac
 fi
 
-# list of applications ported to KF6 post-24.02 in SLOT=6 having to block SLOT=5
+# list of applications ported to KF6 post-24.02 having to block SLOT=5
 if $(ver_test -gt 24.04.75); then
 	case ${PN} in
 		audex | \
@@ -262,7 +262,7 @@ if $(ver_test -gt 24.04.75); then
 	esac
 fi
 
-# list of applications ported to KF6 post-24.05 in SLOT=6 having to block SLOT=5
+# list of applications ported to KF6 post-24.05 having to block SLOT=5
 if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
@@ -285,8 +285,7 @@ if $(ver_test -gt 24.07.75); then
 	esac
 fi
 
-# list of applications ported to KF6 post-24.08 in SLOT=6 having to block SLOT=5
-# (option to build with KF6 in master, but default remains KF5)
+# list of applications ported to KF6 post-24.08 having to block SLOT=5
 if $(ver_test -gt 24.11.75); then
 	case ${PN} in
 		cantor | \
@@ -301,4 +300,13 @@ if $(ver_test -gt 24.11.75); then
 	esac
 fi
 
+# list of applications ported to KF6 post-25.04 having to block SLOT=5
+if $(ver_test -gt 25.07.75); then
+	case ${PN} in
+		artikulate)
+			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
+		*) ;;
+	esac
+fi
+
 fi

diff --git a/kde-apps/artikulate/artikulate-9999.ebuild b/kde-apps/artikulate/artikulate-9999.ebuild
index dd5ba26afd..00d7701b02 100644
--- a/kde-apps/artikulate/artikulate-9999.ebuild
+++ b/kde-apps/artikulate/artikulate-9999.ebuild
@@ -5,38 +5,36 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
+KFMIN=6.9.0
+QTMIN=6.8.1
+inherit ecm gear.kde.org xdg
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="https://apps.kde.org/artikulate/"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="0"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-libs/libxml2
+	>=dev-qt/qtbase-${QTMIN}:6[gui,sql,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(