From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E73EA158041 for ; Wed, 28 Feb 2024 10:33:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE4CEE2B4C; Wed, 28 Feb 2024 10:33:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFE94E2B4B for ; Wed, 28 Feb 2024 10:33:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E98BD340813 for ; Wed, 28 Feb 2024 10:33:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7507314E6 for ; Wed, 28 Feb 2024 10:33:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1709115729.a8ed9c37129f5673084de40c8865a1c6f14d3c28.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/, media-libs/ksanecore/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/gear.kde.org.eclass media-libs/ksanecore/ksanecore-24.02.0.ebuild media-libs/ksanecore/ksanecore-24.02.49.9999.ebuild media-libs/ksanecore/ksanecore-9999.ebuild X-VCS-Directories: eclass/ media-libs/ksanecore/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a8ed9c37129f5673084de40c8865a1c6f14d3c28 X-VCS-Branch: master Date: Wed, 28 Feb 2024 10:33:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6ef52a75-2135-4de6-a86d-ecdabcdb023b X-Archives-Hash: ce2b4cd57c7f41ade97b00c476087370 commit: a8ed9c37129f5673084de40c8865a1c6f14d3c28 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 28 10:11:36 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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(-)] +"