x11-base/xorg-server: fix build when USE=minimal

x11-proto/dri2proto is still required in this case, so move to CDEPENDS

ACKed by mattst88

Gentoo-Bug: https://bugs.gentoo.org/539766

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index 24bb18f2263b82046a7a7bf8da4238f604b6dda8..0fdc51f18a18081c8eab940de4c20168876040e3 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
@@ -107,6 +107,7 @@ DEPEND="${CDEPEND}
        >=x11-proto/xineramaproto-1.1.3
        >=x11-proto/xproto-7.0.28
        >=x11-proto/presentproto-1.0
+       >=x11-proto/dri2proto-2.8
        >=x11-proto/dri3proto-1.0
        dmx? (
                >=x11-proto/dmxproto-2.2.99.1
@@ -120,7 +121,6 @@ DEPEND="${CDEPEND}
        )
        !minimal? (
                >=x11-proto/xf86driproto-2.1.0
-               >=x11-proto/dri2proto-2.8
        )"
 
 RDEPEND="${CDEPEND}

diff --git a/x11-base/xorg-server/xorg-server-1.19.1.ebuild b/x11-base/xorg-server/xorg-server-1.19.1.ebuild
index 883dd14ce187ccbdbd61193d7d8213bb6a83c38c..f209cb7ff79aaee94781dc570fcc13872c590319 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.19.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.1.ebuild
@@ -108,6 +108,7 @@ DEPEND="${CDEPEND}
        >=x11-proto/xineramaproto-1.1.3
        >=x11-proto/xproto-7.0.31
        >=x11-proto/presentproto-1.0
+       >=x11-proto/dri2proto-2.8
        >=x11-proto/dri3proto-1.0
        dmx? (
                >=x11-proto/dmxproto-2.2.99.1
@@ -121,7 +122,6 @@ DEPEND="${CDEPEND}
        )
        !minimal? (
                >=x11-proto/xf86driproto-2.1.0
-               >=x11-proto/dri2proto-2.8
        )"
 
 RDEPEND="${CDEPEND}

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 6e3fcaf6be9b872465b0fe4136e9949a272a53db..698fceac2d3399ee4fda34d133a7287c017fadce 100644 (file)
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -108,6 +108,7 @@ DEPEND="${CDEPEND}
        >=x11-proto/xineramaproto-1.1.3
        >=x11-proto/xproto-7.0.31
        >=x11-proto/presentproto-1.0
+       >=x11-proto/dri2proto-2.8
        >=x11-proto/dri3proto-1.0
        dmx? (
                >=x11-proto/dmxproto-2.2.99.1
@@ -121,7 +122,6 @@ DEPEND="${CDEPEND}
        )
        !minimal? (
                >=x11-proto/xf86driproto-2.1.0
-               >=x11-proto/dri2proto-2.8
        )"
 
 RDEPEND="${CDEPEND}