[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     cf336d57503e67447129f1a3747bb474c2513094
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 12:54:34 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 12:54:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf336d57

kde-misc/kdiff3: Port to KF6

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

 kde-misc/kdiff3/kdiff3-9999.ebuild | 34 +++++++++++++++++-----------------
 kde-misc/kdiff3/metadata.xml       |  1 +
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index c14f073c9c..34fb160506 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -4,43 +4,43 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=6.0.0
+QTMIN=6.6.2
 inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
 HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
 
 LICENSE="GPL-2"
-SLOT="5"
+SLOT="0"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=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/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 "
 RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
 	sys-apps/diffutils
 "
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
+		-DBUILD_WITH_QT6=ON
+		# TODO: -DENABLE_GDBINDEX?
 	)
 	ecm_src_configure
 }

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index ce2a339150..b100fbb81d 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">sdk/kdiff3</remote-id>
 	</upstream>
 </pkgmetadata>