X-Git-Url: http://git.draconx.ca/gitweb/gentoo-draconx.git/blobdiff_plain/a7bf0702f0468e02bfc88a4cd2b235ed001a4f1f..c0fdfbbde397392fdf0c3ee518e09a6023143316:/x11-base/xorg-server/xorg-server-9999.ebuild

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 64650f6..58780c2 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 DESCRIPTION="X.Org X servers"
 KEYWORDS=""
 
-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
@@ -79,7 +79,16 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xf86vidmodeproto-2.2.99.1
 	>=x11-proto/xineramaproto-1.1.3
 	>=x11-proto/xproto-7.0.17
-	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
 	!minimal? (
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.3
@@ -101,6 +110,7 @@ PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+	"${FILESDIR}"/0001-xfree86-Add-DontLie-server-flag.patch
 	"${FILESDIR}"/0001-xaa-Free-the-scratch-pixmap-header-before-freeing-th.patch
 	"${FILESDIR}"/0002-Remove-the-cacheing-of-the-last-scratch-PixmapRec.patch
 	"${FILESDIR}"/0003-shm-Replace-open-coded-version-of-GetScratchPixmapHe.patch
@@ -131,15 +141,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)