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-plasma/plasma-nm/
Date: Thu, 26 Aug 2021 16:46:41
Message-Id: 1629995548.cd4ddbad06d371a308f007153147f2c3feb45383.asturm@gentoo
1 commit: cd4ddbad06d371a308f007153147f2c3feb45383
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 26 16:32:28 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 26 16:32:28 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd4ddbad
7
8 kde-plasma/plasma-nm: Fix IUSE=openconnect switch
9
10 Upstream commit 4cb6ba1b6ad999ca3da77e7156c591b7fde61e48
11
12 Package-Manager: Portage-3.0.22, Repoman-3.0.3
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 11 ++++++++++-
16 1 file changed, 10 insertions(+), 1 deletion(-)
17
18 diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
19 index 7bfd9338ec..2ddc83df7c 100644
20 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
21 +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
22 @@ -59,12 +59,21 @@ RDEPEND="${DEPEND}
23 >=kde-frameworks/kirigami-${KFMIN}:5
24 >=kde-plasma/kde-cli-tools-${PVCUT}:5
25 "
26 +BDEPEND="virtual/pkgconfig"
27 +
28 +src_prepare() {
29 + ecm_src_prepare
30 +
31 + # TODO: try to get a build switch upstreamed
32 + if ! use openconnect; then
33 + sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
34 + fi
35 +}
36
37 src_configure() {
38 local mycmakeargs=(
39 -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
40 $(cmake_use_find_package modemmanager KF5ModemManagerQt)
41 - $(cmake_use_find_package openconnect OpenConnect)
42 )
43
44 ecm_src_configure