From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CAF91581EE for ; Tue, 25 Mar 2025 16:27:02 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 78FF83432F7 for ; Tue, 25 Mar 2025 16:27:02 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6D1BD110296; Tue, 25 Mar 2025 16:27:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5F4E9110296 for ; Tue, 25 Mar 2025 16:27:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 073F734327A for ; Tue, 25 Mar 2025 16:27:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58CA3122C for ; Tue, 25 Mar 2025 16:26:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1742919888.1db2ebf3048889a3e962f81af60a93a6ed7b275f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/artikulate/, eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/gear.kde.org.eclass kde-apps/artikulate/artikulate-9999.ebuild X-VCS-Directories: kde-apps/artikulate/ eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1db2ebf3048889a3e962f81af60a93a6ed7b275f X-VCS-Branch: master Date: Tue, 25 Mar 2025 16:26:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96525d32-fc61-4a0a-9f45-851edc8f9bc4 X-Archives-Hash: d73b9d4a320bdf5c109d108fc7dd6b16 commit: 1db2ebf3048889a3e962f81af60a93a6ed7b275f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 25 16:22:01 2025 +0000 Commit: Andreas Sturmlechner gentoo 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 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=(