From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76B251580B9 for ; Thu, 26 Aug 2021 16:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 354CAE09BD; Thu, 26 Aug 2021 16:46:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11A23E09BB for ; Thu, 26 Aug 2021 16:46:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9EE5342BB6 for ; Thu, 26 Aug 2021 16:46:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C16688E4 for ; Thu, 26 Aug 2021 16:46:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1629995548.cd4ddbad06d371a308f007153147f2c3feb45383.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-nm/plasma-nm-9999.ebuild X-VCS-Directories: kde-plasma/plasma-nm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cd4ddbad06d371a308f007153147f2c3feb45383 X-VCS-Branch: master Date: Thu, 26 Aug 2021 16:46:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63023dce-e807-4e2b-b3e5-a9da15904300 X-Archives-Hash: 53338b5620a513d975e1b2a3f5d44376 commit: cd4ddbad06d371a308f007153147f2c3feb45383 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 26 16:32:28 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 26 16:32:28 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd4ddbad kde-plasma/plasma-nm: Fix IUSE=openconnect switch Upstream commit 4cb6ba1b6ad999ca3da77e7156c591b7fde61e48 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild index 7bfd9338ec..2ddc83df7c 100644 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild @@ -59,12 +59,21 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-plasma/kde-cli-tools-${PVCUT}:5 " +BDEPEND="virtual/pkgconfig" + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use openconnect; then + sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die + fi +} src_configure() { local mycmakeargs=( -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) $(cmake_use_find_package modemmanager KF5ModemManagerQt) - $(cmake_use_find_package openconnect OpenConnect) ) ecm_src_configure