commit: a8ed9c37129f5673084de40c8865a1c6f14d3c28
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 10:11:36 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 10:22:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8ed9c37
media-libs/ksanecore: Port 24.02 to KF6, block ksanecore:5[-kf6compat]
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 1 -
media-libs/ksanecore/ksanecore-24.02.0.ebuild | 16 +++++++++-------
media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild | 14 ++++++++------
media-libs/ksanecore/ksanecore-9999.ebuild | 4 +++-
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 69358187e1..2904600fa2 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -261,7 +261,6 @@ if $(ver_test -gt 24.03.75); then
kolourpaint | \
kompare | \
krdc | \
- ksanecore | \
libkomparediff2 | \
libksane | \
minuet | \
diff --git a/media-libs/ksanecore/ksanecore-24.02.0.ebuild
b/media-libs/ksanecore/ksanecore-24.02.0.ebuild
index c2f93905e4..415219167d 100644
--- a/media-libs/ksanecore/ksanecore-24.02.0.ebuild
+++ b/media-libs/ksanecore/ksanecore-24.02.0.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=6.0
+QTMIN=6.6.2
inherit ecm gear.kde.org
DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
@@ -12,12 +12,14 @@ HOMEPAGE="https://invent.kde.org/libraries/ksanecore
https://api.kde.org/ksanecore/html/index.html";
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="6"
+KEYWORDS="~amd64"
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild
b/media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild
index 0621e249bd..9d8df83e4c 100644
--- a/media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild
+++ b/media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=5.249.0
+QTMIN=6.6.2
inherit ecm gear.kde.org
DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
@@ -12,12 +12,14 @@ HOMEPAGE="https://invent.kde.org/libraries/ksanecore
https://api.kde.org/ksanecore/html/index.html";
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
+SLOT="6"
KEYWORDS=""
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/media-libs/ksanecore/ksanecore-9999.ebuild
b/media-libs/ksanecore/ksanecore-9999.ebuild
index 69fd25ccb8..9d8df83e4c 100644
--- a/media-libs/ksanecore/ksanecore-9999.ebuild
+++ b/media-libs/ksanecore/ksanecore-9999.ebuild
@@ -20,4 +20,6 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
