public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: eclass/, kde-apps/libkomparediff2/
Date: Fri, 17 May 2024 13:32:08 +0000 (UTC)	[thread overview]
Message-ID: <1715952634.68a074bcd0592c2e625bcd4ee925907ac04c3821.asturm@gentoo> (raw)

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}"


             reply	other threads:[~2024-05-17 13:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-17 13:32 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-21 17:31 [gentoo-commits] proj/kde:master commit in: eclass/, kde-apps/libkomparediff2/ Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1715952634.68a074bcd0592c2e625bcd4ee925907ac04c3821.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox