Split xvfb and xnest USE flags out of minimal USE flag.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

6 files changed, 24 insertions, 17 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index fe077175592f..4c2bf56c3c0f 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.591 2011/06/06 22:41:44 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.592 2011/06/09 21:40:37 mattst88 Exp $
+
+  09 Jun 2011; Matt Turner <mattst88@gentoo.org> xorg-server-1.9.4.ebuild,
+  xorg-server-1.9.5.ebuild, xorg-server-1.10.2.ebuild,
+  xorg-server-1.10.99.901.ebuild:
+  Split xvfb and xnest USE flags out of minimal USE flag.
 
 *xorg-server-1.10.99.901 (06 Jun 2011)
 
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index a739bbd6c6cb..02528e0e2cd1 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -6,6 +6,8 @@
 	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
 	<flag name='kdrive'>Build the kdrive X servers</flag>
 	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
+	<flag name='xnest'>Build the Xnest server</flag>
 	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+	<flag name='xvfb'>Build the Xvfb server</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.10.2.ebuild b/x11-base/xorg-server/xorg-server-1.10.2.ebuild
index 2f365d4f2a1c..950873222e8f 100644
--- a/x11-base/xorg-server/xorg-server-1.10.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.1 2011/05/29 08:19:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.2 2011/06/09 21:40:37 mattst88 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
-IUSE_SERVERS="dmx kdrive xorg"
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
@@ -127,15 +127,15 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
 		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xnest)
 		$(use_enable xorg)
+		$(use_enable xvfb)
 		$(use_enable nptl glx-tls)
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
diff --git a/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild b/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
index a5b5e279beeb..785ca79cb3dd 100644
--- a/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild,v 1.1 2011/06/06 22:41:44 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild,v 1.2 2011/06/09 21:40:37 mattst88 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
-IUSE_SERVERS="dmx kdrive xorg"
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
@@ -127,15 +127,15 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
 		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xnest)
 		$(use_enable xorg)
+		$(use_enable xvfb)
 		$(use_enable nptl glx-tls)
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
diff --git a/x11-base/xorg-server/xorg-server-1.9.4.ebuild b/x11-base/xorg-server/xorg-server-1.9.4.ebuild
index e20a8cda8243..487ae609f838 100644
--- a/x11-base/xorg-server/xorg-server-1.9.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.4.ebuild,v 1.8 2011/03/05 18:05:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.4.ebuild,v 1.9 2011/06/09 21:40:37 mattst88 Exp $
 
 EAPI=3
 inherit xorg-2 multilib versionator
@@ -12,7 +12,7 @@ OPENGL_DIR="xorg-x11"
 DESCRIPTION="X.Org X servers"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 
-IUSE_SERVERS="dmx kdrive xorg"
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
@@ -127,15 +127,15 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
 		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xnest)
 		$(use_enable xorg)
+		$(use_enable xvfb)
 		$(use_enable nptl glx-tls)
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
diff --git a/x11-base/xorg-server/xorg-server-1.9.5.ebuild b/x11-base/xorg-server/xorg-server-1.9.5.ebuild
index b24720ff4975..019ad6eeec62 100644
--- a/x11-base/xorg-server/xorg-server-1.9.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5.ebuild,v 1.6 2011/05/15 13:37:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5.ebuild,v 1.7 2011/06/09 21:40:37 mattst88 Exp $
 
 EAPI=3
 inherit xorg-2 multilib versionator
@@ -12,7 +12,7 @@ OPENGL_DIR="xorg-x11"
 DESCRIPTION="X.Org X servers"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
 
-IUSE_SERVERS="dmx kdrive xorg"
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
@@ -127,15 +127,15 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
 		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xnest)
 		$(use_enable xorg)
+		$(use_enable xvfb)
 		$(use_enable nptl glx-tls)
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)