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>

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 1c904dab6834cb82b66b2185309d8289899643be..945a190f50f92a8a7d77ca1b7edf567564389492 100644 (file)
--- 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 7329385727d9627722495f4da536c277ef115ba6..b5c728873e8ad94715ce4ee6f3e4e3b736338462 100644 (file)
--- 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= )