From cb625716155c239585d752e7c19d113afdeb91af Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 8 Mar 2020 17:04:45 -0700 Subject: [PATCH] x11-base/xorg-server: Block on nvidia-drivers[-libglvnd] If nvidia-drivers are installed without libglvnd support, the Xserver will fail to build. Closes: https://bugs.gentoo.org/711780 Signed-off-by: Matt Turner --- x11-base/xorg-server/xorg-server-1.20.7.ebuild | 1 + x11-base/xorg-server/xorg-server-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild index 1c904dab6834..945a190f50f9 100644 --- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.7.ebuild @@ -19,6 +19,7 @@ IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +sui CDEPEND="libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl + !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 7329385727d9..b5c728873e8a 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -20,6 +20,7 @@ IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +sui CDEPEND="libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl + !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) -- 2.26.2