commit:     cb625716155c239585d752e7c19d113afdeb91af
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 00:04:45 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 00:07:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb625716

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 <mattst88 <AT> gentoo.org>

 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 1c904dab683..945a190f50f 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 7329385727d..b5c728873e8 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= )

Reply via email to