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

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

7 files changed, 30 insertions, 23 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/Manifest b/x11-base/xorg-server/Manifest
index 70a5d685efb8..0f20c22064ef 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -10,9 +10,9 @@ DIST xorg-server-1.10.2.tar.bz2 5334473 RMD160 3d1ad6b236772ebe0400a69a03b9093bb
 DIST xorg-server-1.10.99.901.tar.bz2 4926641 RMD160 268a3993204012653c62e0f7fa20db9285a675f9 SHA1 106b6806b64ae368f1f8d52568ca272f88d0c567 SHA256 b7c9a0e3d1bb86adbbb52ef44a1ef41f41e00247cd7b36a8a0eafb2a8f3a3149
 DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-EBUILD xorg-server-1.10.2.ebuild 6896 RMD160 b8a6071206480dcf45a65a880628673b56ef7891 SHA1 7a8369b906e7000c287d77549ebdf93229b306f2 SHA256 add339100aa3bc97224c6786e5ce34fc84db842101dee1f5bcaf76a80a6144d3
-EBUILD xorg-server-1.10.99.901.ebuild 6900 RMD160 257c227597440f73b9b8902d72c60e04ded5b522 SHA1 1621b61f84016f21b1104783c2151d43437af098 SHA256 09ebf7ada9aed5536678784cefe984ed15063a0bb5324f296ea4f4c9ce4f8ff5
-EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295
-EBUILD xorg-server-1.9.5.ebuild 7803 RMD160 a15a33dcc85ed07dc52a27dfe98adf6516adbbef SHA1 1ad7aacafffc0837b6e6f2994126ecfb77e68df1 SHA256 f1047666519bd144edc72f18346cb19b8685c3237a9b491725cc6fe994f6216b
-MISC ChangeLog 127383 RMD160 152081cb1096925df79d722d95e08031e0966a4b SHA1 72c4a8c96ce72ea19860b81818d3b936eb648461 SHA256 77be9c55631b6e18cf2b44652068f31a496b4d7c6af7379ac3edcc976cbb0671
-MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
+EBUILD xorg-server-1.10.2.ebuild 6888 RMD160 e1e6e3e8e0904bf500c4ceb4379c5c837c4602a7 SHA1 2b1b36f57fb9f93841fb956c63c40cbc19cb2ee2 SHA256 4f4c87a33bed48f2f2f6bf21f7a1ef34fc4a08094984ad8a5d5ebb109a2fa58b
+EBUILD xorg-server-1.10.99.901.ebuild 6893 RMD160 0ad445f2ea3e21089adf3f91c659b5850d9f8c11 SHA1 c1a9e1fcb25faa20a90a198e43cfba7c18e15c0f SHA256 fa4d7fc978376f1d7ff1c84d48f14f0f8fd0088afb68375d4dc2b2e5c36ce517
+EBUILD xorg-server-1.9.4.ebuild 7795 RMD160 2a13a293b5d7964272260034f6af5ff6fbd75f16 SHA1 c115e24b6de40381e7a1bb47ac06fdcc1cf5b1fb SHA256 af0e0e9deb3267a0d77d6f6a92c2870eb68a8681e4c8d80c1c3ee12fe9d1282c
+EBUILD xorg-server-1.9.5.ebuild 7797 RMD160 fd4d776ab249a4fd7dad9a659fa5d952cfe5ddec SHA1 fa40c10802e36aeab8f939ca0c576f04c5aac0ea SHA256 a6a4372f71df6d70c70d6aeb15f9f079ca3de766f299de07a785b910fd1dfed9
+MISC ChangeLog 127606 RMD160 17f145fd05f26669b9728e50e0a513f0da86a554 SHA1 b7a25f6ac7053d80a7cf85ceeff3fe707bc3b0ed SHA256 eb2983ce31dda80642c5d32c6c2a7014a0e576427628609827f8a4b3e22649e2
+MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
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)