commit: 2ee2fcd4364fe822f000239b32a5d1490600581f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 5 10:18:50 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 5 15:17:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee2fcd4
kde-frameworks/kglobalaccel: Add back IUSE X Upstream commit 7d6ef389defbcf8fc25762ce772315221a721790 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=426199 Bug: https://bugs.gentoo.org/540120 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...5.96.0.ebuild => kglobalaccel-5.96.0-r1.ebuild} | 29 ++++++++++++++-------- kde-frameworks/kglobalaccel/metadata.xml | 3 +++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild similarity index 62% rename from kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild rename to kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild index 7d152d089bbb..b325e1626d1f 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild @@ -12,23 +12,25 @@ DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" +IUSE="nls X" -# requires installed instance -RESTRICT="test" +REQUIRED_USE="test? ( X )" +RESTRICT="test" # requires installed instance RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] - x11-libs/libxcb - x11-libs/xcb-util-keysyms + X? ( + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) " DEPEND="${RDEPEND} test? ( @@ -39,6 +41,13 @@ DEPEND="${RDEPEND} " BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +src_configure() { + local mycmakeargs=( + -DBUILD_RUNTIME=$(usex X) + ) + ecm_src_configure +} + src_test() { XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342 } diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml index 506ecf605bc4..39e72e4520b0 100644 --- a/kde-frameworks/kglobalaccel/metadata.xml +++ b/kde-frameworks/kglobalaccel/metadata.xml @@ -13,4 +13,7 @@ Must only be used by packages that are known to use private parts of the Frameworks API. </subslots> </slots> + <use> + <flag name="X">Build the kglobalacceld runtime needed for X</flag> + </use> </pkgmetadata>
