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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B509D15808B for ; Mon, 21 Feb 2022 11:47:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5F9CE0995; Mon, 21 Feb 2022 11:47:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEB33E0995 for ; Mon, 21 Feb 2022 11:47:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE67934375A for ; Mon, 21 Feb 2022 11:47:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 384C42EC for ; Mon, 21 Feb 2022 11:47:20 +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: <1645444026.2138bab01d36e14ba09fe61ea14e55a691d3efb1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2138bab01d36e14ba09fe61ea14e55a691d3efb1 X-VCS-Branch: master Date: Mon, 21 Feb 2022 11:47:20 +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: 28379acb-ffc0-4559-84da-998b8f444c6b X-Archives-Hash: 4c333a7ef1a53d9db89169238950bec0 commit: 2138bab01d36e14ba09fe61ea14e55a691d3efb1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 11:46:42 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 11:47:06 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2138bab0 kde-plasma/plasma-workspace: Fix IUSE gps Upstream commit 6045c1ee7d3236796a4e5a35e3f1b84c4bba7f03 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild | 8 ++++++-- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild index c8abf2ec6c..9b6a2f6869 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild @@ -167,6 +167,12 @@ src_prepare() { sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die fi + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + if ! use policykit; then cmake_run_in kcms cmake_comment_add_subdirectory users fi @@ -186,8 +192,6 @@ src_configure() { $(cmake_use_find_package telemetry KUserFeedback) ) - use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) - ecm_src_configure } diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index d7c8efc899..c90668f9a5 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -167,6 +167,12 @@ src_prepare() { sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die fi + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + if ! use policykit; then cmake_run_in kcms cmake_comment_add_subdirectory users fi @@ -184,8 +190,6 @@ src_configure() { $(cmake_use_find_package telemetry KUserFeedback) ) - use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) - ecm_src_configure }