Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kglobalaccel/
Date: Fri, 05 Aug 2022 14:56:10
Message-Id: 1659711319.9fa5923fa27c279ce4bc32312500aea04f1b2fb3.asturm@gentoo
1 commit: 9fa5923fa27c279ce4bc32312500aea04f1b2fb3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 5 10:18:50 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 5 14:55:19 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9fa5923f
7
8 kde-frameworks/kglobalaccel: Add back IUSE X
9
10 Upstream commit 7d6ef389defbcf8fc25762ce772315221a721790
11 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=426199
12
13 Bug: https://bugs.gentoo.org/540120
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../kglobalaccel/kglobalaccel-9999.ebuild | 29 ++++++++++++++--------
17 kde-frameworks/kglobalaccel/metadata.xml | 3 +++
18 2 files changed, 22 insertions(+), 10 deletions(-)
19
20 diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
21 index 16073e30e4..a109e7f1cc 100644
22 --- a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
23 +++ b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
24 @@ -12,23 +12,25 @@ DESCRIPTION="Framework to handle global shortcuts"
25
26 LICENSE="LGPL-2+"
27 KEYWORDS=""
28 -IUSE="nls"
29 +IUSE="nls X"
30
31 -# requires installed instance
32 -RESTRICT="test"
33 +REQUIRED_USE="test? ( X )"
34 +RESTRICT="test" # requires installed instance
35
36 RDEPEND="
37 >=dev-qt/qtdbus-${QTMIN}:5
38 >=dev-qt/qtgui-${QTMIN}:5
39 >=dev-qt/qtwidgets-${QTMIN}:5
40 >=dev-qt/qtx11extras-${QTMIN}:5
41 - =kde-frameworks/kconfig-${PVCUT}*:5
42 - =kde-frameworks/kcoreaddons-${PVCUT}*:5
43 - =kde-frameworks/kcrash-${PVCUT}*:5
44 - =kde-frameworks/kdbusaddons-${PVCUT}*:5
45 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
46 - x11-libs/libxcb
47 - x11-libs/xcb-util-keysyms
48 + X? (
49 + =kde-frameworks/kconfig-${PVCUT}*:5
50 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
51 + =kde-frameworks/kcrash-${PVCUT}*:5
52 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
53 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
54 + x11-libs/libxcb
55 + x11-libs/xcb-util-keysyms
56 + )
57 "
58 DEPEND="${RDEPEND}
59 test? (
60 @@ -39,6 +41,13 @@ DEPEND="${RDEPEND}
61 "
62 BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
63
64 +src_configure() {
65 + local mycmakeargs=(
66 + -DBUILD_RUNTIME=$(usex X)
67 + )
68 + ecm_src_configure
69 +}
70 +
71 src_test() {
72 XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
73 }
74
75 diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml
76 index 506ecf605b..39e72e4520 100644
77 --- a/kde-frameworks/kglobalaccel/metadata.xml
78 +++ b/kde-frameworks/kglobalaccel/metadata.xml
79 @@ -13,4 +13,7 @@
80 Must only be used by packages that are known to use private parts of the Frameworks API.
81 </subslots>
82 </slots>
83 + <use>
84 + <flag name="X">Build the kglobalacceld runtime needed for X</flag>
85 + </use>
86 </pkgmetadata>