diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-18 22:56:51 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-19 21:33:38 +0200 |
| commit | 86a2cba598c064af64ec7bd8a6ea34913e0ad6b4 (patch) | |
| tree | 86bedd2fb1eb16203672e015bbb6d488f7870610 | |
| parent | bcf597aadd7a6fd4c314e853e4fadb63bdb1ddb6 (diff) | |
| download | kde-86a2cba598c064af64ec7bd8a6ea34913e0ad6b4.tar.gz kde-86a2cba598c064af64ec7bd8a6ea34913e0ad6b4.tar.bz2 kde-86a2cba598c064af64ec7bd8a6ea34913e0ad6b4.zip | |
kde-apps/libksane: Port 24.05 to KF6, block libksane:5[-kf6compat]
We need it for kde-apps/kolourpaint:6.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/gear.kde.org.eclass | 1 | ||||
| -rw-r--r-- | kde-apps/libksane/libksane-24.05.49.9999.ebuild | 28 | ||||
| -rw-r--r-- | kde-apps/libksane/libksane-9999.ebuild | 4 |
3 files changed, 17 insertions, 16 deletions
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 35c30d662c9..fb391e7d1dd 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -284,7 +284,6 @@ if $(ver_test -gt 24.10.75); then kdesdk-thumbnailers | \ kompare | \ krdc | \ - libksane | \ minuet | \ skanlite | \ step) diff --git a/kde-apps/libksane/libksane-24.05.49.9999.ebuild b/kde-apps/libksane/libksane-24.05.49.9999.ebuild index ae5c35d0e0e..7098012d2f4 100644 --- a/kde-apps/libksane/libksane-24.05.49.9999.ebuild +++ b/kde-apps/libksane/libksane-24.05.49.9999.ebuild @@ -3,33 +3,33 @@ EAPI=8 -KFMIN=5.115.0 -QTMIN=5.15.12 +KFMIN=6.0.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 inherit ecm gear.kde.org DESCRIPTION="SANE Library interface based on KDE Frameworks" LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="5" +SLOT="6" KEYWORDS="" IUSE="kwallet" DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=media-libs/ksanecore-23.08.5:5 - kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=media-libs/ksanecore-${PVCUT}:6 + kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] " -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package kwallet KF5Wallet) + $(cmake_use_find_package kwallet KF6Wallet) ) ecm_src_configure } diff --git a/kde-apps/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild index 7c6c3030745..7098012d2f4 100644 --- a/kde-apps/libksane/libksane-9999.ebuild +++ b/kde-apps/libksane/libksane-9999.ebuild @@ -23,7 +23,9 @@ DEPEND=" >=media-libs/ksanecore-${PVCUT}:6 kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" src_configure() { local mycmakeargs=( |