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

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

[Andreas Sturmlechner]

commit:     68a074bcd0592c2e625bcd4ee925907ac04c3821
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 13:29:22 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 17 13:30:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=68a074bc

kde-apps/libkomparediff2: Revert "Port to KF6"

This reverts commit 8e7ffa42bfa238716844ca8011a385255f0a2b81.

Upstream definitely do not want us to build as KF6-based right now.

Upstream commit 2422cb5c16ad7091dc93a8cfb7c6deabe110b8af

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

 eclass/gear.kde.org.eclass                          |  1 -
 .../libkomparediff2/libkomparediff2-9999.ebuild     | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 4a5b26d64c..eb64724f37 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -285,7 +285,6 @@ if $(ver_test -gt 24.10.75); then
 		kdesdk-thumbnailers | \
 		kompare | \
 		krdc | \
-		libkomparediff2 | \
 		libksane | \
 		minuet | \
 		skanlite | \

diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
index 2a6f76965c..f2dde262df 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
@@ -4,24 +4,25 @@
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=6.0.0
-QTMIN=6.6.2
+KFMIN=5.115.0
+QTMIN=5.15.12
 inherit ecm gear.kde.org
 
 DESCRIPTION="KDE library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=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/kxmlgui-${KFMIN}:6
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}: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/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"

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

[Andreas Sturmlechner]

commit:     46585c84170201aa67da7284f0f3d30d9cb6c257
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 18:59:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 18:59:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=46585c84

kde-apps/libkomparediff2: Port to KF6

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

 eclass/gear.kde.org.eclass                         |  1 +
 .../libkomparediff2/libkomparediff2-9999.ebuild    | 23 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 2f5e179e0b..2cf65908ee 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -271,6 +271,7 @@ if $(ver_test -gt 24.07.75); then
 		kgraphviewer | \
 		kimagemapeditor | \
 		kmplot | \
+		libkomparediff2 | \
 		lokalize | \
 		massif-visualizer | \
 		poxml)

diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
index f2dde262df..4c492d3f10 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
@@ -4,25 +4,24 @@
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.3.0
+QTMIN=6.6.2
 inherit ecm gear.kde.org
 
-DESCRIPTION="KDE library to compare files and strings"
+DESCRIPTION="Library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=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/kxmlgui-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"