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 A6ABD13933E for ; Thu, 8 Jul 2021 01:34:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F7AEE0D92; Thu, 8 Jul 2021 01:34:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EEDBCE0D64 for ; Thu, 8 Jul 2021 01:34:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 46218342AA0 for ; Thu, 8 Jul 2021 01:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7A0C7C9 for ; Thu, 8 Jul 2021 01:34:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1625707627.b018c0aeaad98098c876a493a682b47f948f6e1a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/mutter-40.2.1.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b018c0aeaad98098c876a493a682b47f948f6e1a X-VCS-Branch: master Date: Thu, 8 Jul 2021 01:34:05 +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: 070dc971-2255-4433-b6cf-6cc06189cb58 X-Archives-Hash: 639c80a87c971bf12e6317cd8b5fe39e commit: b018c0aeaad98098c876a493a682b47f948f6e1a Author: Niklāvs Koļesņikovs <89q1r14hd relay firefox com> AuthorDate: Sun May 16 22:13:48 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jul 8 01:27:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b018c0ae x11-wm/mutter: Accept cvt from x11-libs/libxcvt Closes: https://bugs.gentoo.org/777564 Closes: https://github.com/gentoo/gentoo/pull/20844 Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd relay.firefox.com> Signed-off-by: Matt Turner gentoo.org> x11-wm/mutter/mutter-40.2.1.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild index 62bbdb155ee..e981a487b65 100644 --- a/x11-wm/mutter/mutter-40.2.1.ebuild +++ b/x11-wm/mutter/mutter-40.2.1.ebuild @@ -82,7 +82,7 @@ DEPEND="${DEPEND} x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) " -# wayland bdepend for wayland-scanner, xorg-server for cvt utility +# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary BDEPEND=" dev-libs/wayland dev-util/gdbus-codegen @@ -90,8 +90,13 @@ BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) - wayland? ( >=sys-kernel/linux-headers-4.4 - x11-base/xorg-server ) + wayland? ( + >=sys-kernel/linux-headers-4.4 + || ( + x11-libs/libxcvt + x11-base/xorg-server[xorg,-minimal] + ) + ) " PATCHES=(