[gentoo-commits] proj/kde:master commit in: kde-plasma/libplasma/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     9deb0fb743042c50e94a73bcdf5bf84217c7493a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 22:49:47 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 23:21:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9deb0fb7

kde-plasma/libplasma: Add IUSE=kf6compat

See also:
https://community.kde.org/Plasma/Plasma_6.0_Release_notes#Coinstallbility

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/libplasma/libplasma-5.239.9999.ebuild | 11 +++++++----
 kde-plasma/libplasma/metadata.xml                |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/libplasma/libplasma-5.239.9999.ebuild b/kde-plasma/libplasma/libplasma-5.239.9999.ebuild
index c80f10dcc8..2bb0c32f4c 100644
--- a/kde-plasma/libplasma/libplasma-5.239.9999.ebuild
+++ b/kde-plasma/libplasma/libplasma-5.239.9999.ebuild
@@ -14,12 +14,12 @@ DESCRIPTION="Plasma library and runtime components based upon KF5 and Qt5"
 
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="gles2-only man wayland"
+IUSE="gles2-only kf6compat man wayland"
 
 RESTRICT="test"
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
@@ -54,14 +54,17 @@ RDEPEND="
 		media-libs/libglvnd
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
+RDEPEND="${COMMON_DEPEND}
+	kf6compat? ( kde-plasma/libplasma:6 )
+"
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )"
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_DESKTOPTHEMES=ON # TODO: switch for KF6 compat
+		-DBUILD_DESKTOPTHEMES=$(usex !kf6compat)
 		$(cmake_use_find_package !gles2-only OpenGL)
 		$(cmake_use_find_package man KF5DocTools)
 		$(cmake_use_find_package wayland EGL)

diff --git a/kde-plasma/libplasma/metadata.xml b/kde-plasma/libplasma/metadata.xml
index 936dd6d7c0..ab1489f0a2 100644
--- a/kde-plasma/libplasma/metadata.xml
+++ b/kde-plasma/libplasma/metadata.xml
@@ -9,6 +9,9 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="kde-invent">plasma/libplasma</remote-id>
 	</upstream>
+	<use>
+		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+	</use>
 	<slots>
 		<subslots>
 			Must only be used by packages that are known to use private parts of the Frameworks API.