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 C856815852A for ; Fri, 23 Aug 2024 05:23:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDE71E2A07; Fri, 23 Aug 2024 05:23:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B1220E2A1C for ; Fri, 23 Aug 2024 05:23:41 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E745A342F9D for ; Fri, 23 Aug 2024 05:23:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35CAA1F12 for ; Fri, 23 Aug 2024 05:23:38 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1724390487.055fbf9c705c61023de2860f624d43dff70d0a7d.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild X-VCS-Directories: gnome-extra/cinnamon-settings-daemon/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 055fbf9c705c61023de2860f624d43dff70d0a7d X-VCS-Branch: master Date: Fri, 23 Aug 2024 05:23:38 +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: 181df030-87f0-42f7-b830-f0949a8ac94c X-Archives-Hash: 0b54cb98ca54d71cd93f9873d94d556f commit: 055fbf9c705c61023de2860f624d43dff70d0a7d Author: Eli Schwartz gentoo org> AuthorDate: Wed Aug 21 20:55:21 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Fri Aug 23 05:21:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055fbf9c gnome-extra/cinnamon-settings-daemon: conditionalize wayland on wacom The only plugin that uses gtk's wayland support -- or any wayland support at all -- is the wacom plugin. It is otherwise meaningless to depend on gtk's wayland support, so rejuggle the dependencies to reflect that. Signed-off-by: Eli Schwartz gentoo.org> ...emon-6.2.0.ebuild => cinnamon-settings-daemon-6.2.0-r1.ebuild} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild similarity index 94% rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild index bf665356ce46..7abe049b1722 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild @@ -28,7 +28,6 @@ RDEPEND=" >=sys-auth/polkit-0.97 x11-libs/cairo x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.14.0:3[wayland=] >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXext @@ -44,8 +43,13 @@ RDEPEND=" app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( + >=x11-libs/gtk+-3.14.0:3[wayland=] >=dev-libs/libwacom-0.7:= - >=gnome-base/librsvg-2.36.2 ) + >=gnome-base/librsvg-2.36.2 + ) + !input_devices_wacom? ( + >=x11-libs/gtk+-3.14.0:3 + ) smartcard? ( dev-libs/nspr >=dev-libs/nss-3.11.2