commit: 0f1e9e763de74e3d59470c2e0d96d80eedc2a1e2 Author: Mehmet Karataş <krtsmmt <AT> gmail <DOT> com> AuthorDate: Tue Dec 12 19:20:50 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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ş <krtsmmt <AT> gmail.com> Closes: https://github.com/gentoo/kde/pull/940 Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 @@ </upstream> <use> <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> <flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag> </use> <slots>
