commit: b018c0aeaad98098c876a493a682b47f948f6e1a Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com> AuthorDate: Sun May 16 22:13:48 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <AT> relay.firefox.com> Signed-off-by: Matt Turner <mattst88 <AT> 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=(
