From: Austin English <wizardedit@gentoo.org>
Date: Thu, 16 Feb 2017 17:40:51 +0000 (-0600)
Subject: x11-base/xorg-server: fix build when USE=minimal
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6329b2135cb42a69625a70a182fab0062ad73a21;p=gentoo.git

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 24bb18f2263b..0fdc51f18a18 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 883dd14ce187..f209cb7ff79a 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 6e3fcaf6be9b..698fceac2d33 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}