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 528F9158013 for ; Tue, 12 Dec 2023 20:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 692772BC076; Tue, 12 Dec 2023 20:02:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 4F80A2BC071 for ; Tue, 12 Dec 2023 20:02:16 +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 9BF8A335D6D for ; Tue, 12 Dec 2023 20:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0B4E14BD for ; Tue, 12 Dec 2023 20:02:12 +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: <1702411275.0f1e9e763de74e3d59470c2e0d96d80eedc2a1e2.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/kio-5.113.0.ebuild kde-frameworks/kio/kio-5.239.9999.ebuild kde-frameworks/kio/metadata.xml X-VCS-Directories: kde-frameworks/kio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0f1e9e763de74e3d59470c2e0d96d80eedc2a1e2 X-VCS-Branch: master Date: Tue, 12 Dec 2023 20:02:12 +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: c3af5bd7-c39a-4d6b-8705-3f8c2ffea62a X-Archives-Hash: 2409dedfff1c7b095b3fee57e31cc1bc commit: 0f1e9e763de74e3d59470c2e0d96d80eedc2a1e2 Author: Mehmet Karataş gmail com> AuthorDate: Tue Dec 12 19:20:50 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 12 20:01:15 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f1e9e76 kde-frameworks/kio: Fix co-install with kde-apps/kio-extras:6 https://invent.kde.org/frameworks/kio/-/commit/4c1ecde561154f51b3b1ba1cca29a21dcd286716 Signed-off-by: Mehmet Karataş gmail.com> Closes: https://github.com/gentoo/kde/pull/940 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kio/kio-5.113.0.ebuild | 4 +++- kde-frameworks/kio/kio-5.239.9999.ebuild | 4 +++- kde-frameworks/kio/metadata.xml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/kio/kio-5.113.0.ebuild b/kde-frameworks/kio/kio-5.113.0.ebuild index 92d54f239d..fd3d6028a0 100644 --- a/kde-frameworks/kio/kio-5.113.0.ebuild +++ b/kde-frameworks/kio/kio-5.113.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Framework providing transparent file and data management" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="acl kerberos +kwallet X" +IUSE="acl kerberos kf6compat +kwallet X" # tests hang RESTRICT="test" @@ -60,6 +60,7 @@ RDEPEND=" =kde-frameworks/kdoctools-${PVCUT}*:5 ) kerberos? ( virtual/krb5 ) + kf6compat? ( kde-apps/kio-extras:6 ) kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) " @@ -75,6 +76,7 @@ src_configure() { $(cmake_use_find_package acl ACL) $(cmake_use_find_package kerberos GSSAPI) $(cmake_use_find_package kwallet KF5Wallet) + -DKF6_COMPAT_BUILD=$(usex kf6compat) -DWITH_X11=$(usex X) ) diff --git a/kde-frameworks/kio/kio-5.239.9999.ebuild b/kde-frameworks/kio/kio-5.239.9999.ebuild index a58e122c3d..e16d4b4f26 100644 --- a/kde-frameworks/kio/kio-5.239.9999.ebuild +++ b/kde-frameworks/kio/kio-5.239.9999.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Framework providing transparent file and data management" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="acl kerberos +kwallet X" +IUSE="acl kerberos kf6compat +kwallet X" # tests hang RESTRICT="test" @@ -60,6 +60,7 @@ RDEPEND=" =kde-frameworks/kdoctools-${PVCUT}*:5 ) kerberos? ( virtual/krb5 ) + kf6compat? ( kde-apps/kio-extras:6 ) kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) " @@ -75,6 +76,7 @@ src_configure() { $(cmake_use_find_package acl ACL) $(cmake_use_find_package kerberos GSSAPI) $(cmake_use_find_package kwallet KF5Wallet) + -DKF6_COMPAT_BUILD=$(usex kf6compat) -DWITH_X11=$(usex X) ) diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml index ef4d43059c..01d1befe34 100644 --- a/kde-frameworks/kio/metadata.xml +++ b/kde-frameworks/kio/metadata.xml @@ -10,6 +10,7 @@ Build plugins for dev-qt/designer + Disable components colliding with KF6, depend on KF6 components instead Enable permanent storage of passwords for kpasswdserver with kde-frameworks/kwallet