x11-base/xorg-server: Require glamor/wayland are disabled for USE=minimal

Not terribly pleased with this all around. Probably best to remove the
glamor USE flag at this point and enable it if minimal is not set.
Unfortunately there are reverse dependencies that need to be fixed.

Closes: https://bugs.gentoo.org/669812
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index 58a1829ee6aafd4f1d43169e0d79a3920625aa26..2e16bd2cc04ff67f3259398e0bf6213601d675c2 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -107,6 +107,7 @@ PDEPEND="
 REQUIRED_USE="!minimal? (
                || ( ${IUSE_SERVERS} )
        )
+       minimal? ( !glamor !wayland )
        xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 22ad7ddccf9be405dca5f45cde3c624512786d10..b5e027d78c1e6142bd957cebf4bbf84da86fee77 100644 (file)
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -106,6 +106,7 @@ PDEPEND="
 REQUIRED_USE="!minimal? (
                || ( ${IUSE_SERVERS} )
        )
+       minimal? ( !glamor !wayland )
        xephyr? ( kdrive )"
 
 #UPSTREAMED_PATCHES=(