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

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

[Andreas Sturmlechner]

commit:     c8ab59af6b882dbad18a61e1af30035c068f1f44
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 11:15:10 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 20 21:22:46 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8ab59af

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

This reverts commit 86da703c2c80f7d7c9af429cd2d4857d66910498,
to not conflict with also reverted-back-to-KF5 libkomparediff2.

Follow-up to commit 68a074bcd0592c2e625bcd4ee925907ac04c3821.

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

 eclass/gear.kde.org.eclass           |  1 -
 kde-apps/kompare/kompare-9999.ebuild | 40 +++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 0bf4e6bf5e..a271a9f79f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -282,7 +282,6 @@ if $(ver_test -gt 24.10.75); then
 	case ${PN} in
 		kalzium | \
 		kdesdk-thumbnailers | \
-		kompare | \
 		krdc | \
 		minuet | \
 		skanlite | \

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
index ecfd5b99fe..cb9296c63b 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-9999.ebuild
@@ -5,34 +5,36 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=6.0.0
-QTMIN=6.6.2
+KFMIN=5.115.0
+QTMIN=5.15.12
 inherit ecm gear.kde.org
 
 DESCRIPTION="A program to view the differences between files"
 HOMEPAGE="https://apps.kde.org/kompare/"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkomparediff2-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libkomparediff2-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"