summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-03-08 17:04:45 -0700
committerMatt Turner <mattst88@gentoo.org>2020-03-08 17:07:22 -0700
commitcb625716155c239585d752e7c19d113afdeb91af (patch)
tree5877eefe13f3cdc5c31403c31f768c458ac0d4d3 /x11-base
parentmedia-libs/mesa: Make X11 the primary EGL platform (diff)
downloadgentoo-cb625716155c239585d752e7c19d113afdeb91af.tar.gz
gentoo-cb625716155c239585d752e7c19d113afdeb91af.tar.bz2
gentoo-cb625716155c239585d752e7c19d113afdeb91af.zip
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@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.7.ebuild1
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild1
2 files changed, 2 insertions, 0 deletions
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= )