[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

[Austin English]

commit:     6329b2135cb42a69625a70a182fab0062ad73a21
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 17:40:51 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 17:42:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6329b213

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

 x11-base/xorg-server/xorg-server-1.18.4.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-1.19.1.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 24bb18f226..0fdc51f18a 100644
--- 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 883dd14ce1..f209cb7ff7 100644
--- 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 6e3fcaf6be..698fceac2d 100644
--- 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}