commit: dfe3a6e5f3eea1e535498bd991cc9b3378f8c7b6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 26 19:54:01 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 26 20:04:11 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfe3a6e5
kde-apps/ktouch: Port to KF6, add upstream metadata See also: https://invent.kde.org/education/ktouch/-/merge_requests/40 https://invent.kde.org/education/ktouch/-/merge_requests/41 Bug: https://bugs.gentoo.org/954003 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/gear.kde.org.eclass | 4 ++- kde-apps/ktouch/ktouch-9999.ebuild | 51 +++++++++++++++++--------------------- kde-apps/ktouch/metadata.xml | 3 ++- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 1111a1f0fd..004ccde8aa 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -305,7 +305,9 @@ if $(ver_test -gt 25.07.50); then case ${PN} in artikulate | \ kamoso | \ - kig) + kig | \ + kqtquickcharts | \ + ktouch) RDEPEND+=" !${CATEGORY}/${PN}:5" ;; *) ;; esac diff --git a/kde-apps/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild index 0122089652..4d73f5fdc5 100644 --- a/kde-apps/ktouch/ktouch-9999.ebuild +++ b/kde-apps/ktouch/ktouch-9999.ebuild @@ -3,42 +3,37 @@ EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="optional" PVCUT=$(ver_cut 1-3) -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="Program that helps to learn and practice touch typing" HOMEPAGE="https://apps.kde.org/ktouch/"; LICENSE="GPL-2" # TODO: CHECK -SLOT="5" +SLOT="0" KEYWORDS="" IUSE="X" COMMON_DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 + dev-libs/libxml2:2= + >=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6=[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -47,11 +42,11 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 " RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=kde-apps/kqtquickcharts-${PVCUT}:5 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-apps/kqtquickcharts-${PVCUT}:6 " src_configure() { diff --git a/kde-apps/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml index 6e812b0dfa..9ec8ad3dad 100644 --- a/kde-apps/ktouch/metadata.xml +++ b/kde-apps/ktouch/metadata.xml @@ -6,7 +6,8 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=ktouch</bugs-to> + <remote-id type="kde-invent">education/ktouch</remote-id> </upstream> <use> <flag name="X">Enable support for X11 Keyboard Layout Detection</flag>
