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/kconfig/
Date: Sat, 06 Aug 2022 13:00:59
Message-Id: 1659785648.ed956b5b5b8c726e0e562d2fc1b19257b746d790.asturm@gentoo
1 commit: ed956b5b5b8c726e0e562d2fc1b19257b746d790
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 6 11:32:23 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 6 11:34:08 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed956b5b
7
8 kde-frameworks/kconfig: Revert "Add IUSE qml"
9
10 It was fun while it lasted, we fixed a bunch of packages' cmake deps,
11 but it makes no sense to keep this any longer.
12
13 This reverts commit 7ce0e06d01c326b4c6f90bbfb4947b87741fade3.
14
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 kde-frameworks/kconfig/kconfig-9999.ebuild | 8 ++------
18 kde-frameworks/kconfig/metadata.xml | 3 ---
19 2 files changed, 2 insertions(+), 9 deletions(-)
20
21 diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild
22 index 01549f8eaf..719d85bce1 100644
23 --- a/kde-frameworks/kconfig/kconfig-9999.ebuild
24 +++ b/kde-frameworks/kconfig/kconfig-9999.ebuild
25 @@ -11,7 +11,7 @@ DESCRIPTION="Framework for reading and writing configuration"
26
27 LICENSE="LGPL-2+"
28 KEYWORDS=""
29 -IUSE="dbus nls qml"
30 +IUSE="dbus nls"
31
32 # bug 560086
33 RESTRICT="test"
34 @@ -20,21 +20,17 @@ RDEPEND="
35 >=dev-qt/qtgui-${QTMIN}:5
36 >=dev-qt/qtxml-${QTMIN}:5
37 dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
38 - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
39 "
40 DEPEND="${RDEPEND}
41 test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
42 "
43 -BDEPEND="
44 - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
45 -"
46 +BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
47
48 DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
49
50 src_configure() {
51 local mycmakeargs=(
52 -DKCONFIG_USE_DBUS=$(usex dbus)
53 - $(cmake_use_find_package qml Qt5Qml)
54 )
55 ecm_src_configure
56 }
57
58 diff --git a/kde-frameworks/kconfig/metadata.xml b/kde-frameworks/kconfig/metadata.xml
59 index 4e3b65426d..506ecf605b 100644
60 --- a/kde-frameworks/kconfig/metadata.xml
61 +++ b/kde-frameworks/kconfig/metadata.xml
62 @@ -8,9 +8,6 @@
63 <upstream>
64 <bugs-to>https://bugs.kde.org/</bugs-to>
65 </upstream>
66 - <use>
67 - <flag name="qml">Enable QML/QtQuick support via dev-qt/qtdeclarative</flag>
68 - </use>
69 <slots>
70 <subslots>
71 Must only be used by packages that are known to use private parts of the Frameworks API.