diff options
author | Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> | 2021-05-17 01:13:48 +0300 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2021-07-07 18:27:07 -0700 |
commit | b018c0aeaad98098c876a493a682b47f948f6e1a (patch) | |
tree | c3aaf3e46930774e69ac05f8ed9a0889df11d376 /x11-wm | |
parent | x11-base/xorg-server: Don't install cvt or its man page (diff) | |
download | gentoo-b018c0aeaad98098c876a493a682b47f948f6e1a.tar.gz gentoo-b018c0aeaad98098c876a493a682b47f948f6e1a.tar.bz2 gentoo-b018c0aeaad98098c876a493a682b47f948f6e1a.zip |
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 <mattst88@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/mutter/mutter-40.2.1.ebuild | 11 |
1 files 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 62bbdb155ee3..e981a487b659 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=( |