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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19F45158046 for ; Sat, 12 Oct 2024 20:33:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5118EE2A40; Sat, 12 Oct 2024 20:33:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 3654AE2A40 for ; Sat, 12 Oct 2024 20:33:49 +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 3F43D342F9A for ; Sat, 12 Oct 2024 20:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9154A11DF for ; Sat, 12 Oct 2024 20:33:46 +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: <1728764973.f4881c96456b2e87c410ff6d5706a7ad9edc74a4.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-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4881c96456b2e87c410ff6d5706a7ad9edc74a4 X-VCS-Branch: master Date: Sat, 12 Oct 2024 20:33:46 +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: f6895cb8-7f7e-49b9-92ba-059b09e95c3a X-Archives-Hash: 435200bed16a53d92d842062c17c6841 commit: f4881c96456b2e87c410ff6d5706a7ad9edc74a4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 12 20:17:26 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 12 20:29:33 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4881c96 kde-plasma/plasma-workspace: Drop IUSE geolocation, update dependencies Upstream commits: 83e70f80f7d7c7820dce4f810c2e9f4057a675ea 33733d5edceb35a8b1b2626a3217bd14c141f199 947cb0bb0c6dc574f409d73a368475a54d73b4fd Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-workspace/plasma-workspace-9999.ebuild | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index ad1a42096d..ae1b4bf2e1 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -15,10 +15,9 @@ DESCRIPTION="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop systemd telemetry +wallpaper-metadata" +IUSE="appstream +calendar +fontconfig gps +policykit screencast ++semantic-desktop systemd telemetry +wallpaper-metadata" -REQUIRED_USE="gps? ( geolocation )" RESTRICT="test" # kde-frameworks/kwindowsystem[X]: Uses KX11Extras @@ -107,7 +106,6 @@ COMMON_DEPEND=" x11-libs/libXft x11-libs/xcb-util-image ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) gps? ( sci-geosciences/gpsd ) policykit? ( >=sys-auth/polkit-qt-0.175[qt6(+)] @@ -115,7 +113,6 @@ COMMON_DEPEND=" ) screencast? ( >=dev-qt/qtbase-${QTMIN}:6=[opengl] - >=kde-plasma/kpipewire-${PVCUT}:6 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm @@ -127,7 +124,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.14.0 - dev-libs/qcoro[dbus] + dev-libs/qcoro >=dev-qt/qtbase-${QTMIN}:6[concurrent] x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) @@ -171,16 +168,9 @@ src_prepare() { # TODO: try to get a build switch upstreamed if ! use screencast; then - ecm_punt_bogus_dep KPipeWire 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 @@ -204,7 +194,6 @@ src_configure() { $(cmake_use_find_package appstream AppStreamQt) $(cmake_use_find_package calendar KF6Holidays) $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF6NetworkManagerQt) $(cmake_use_find_package semantic-desktop KF6Baloo) $(cmake_use_find_package telemetry KF6UserFeedback) $(cmake_use_find_package wallpaper-metadata KExiv2Qt6)