From 17186df6e6662803c1d9e52e205dc8e06fa76b35 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 29 Jun 2011 10:30:39 -0400 Subject: [PATCH] xorg-server: Sync with X11 overlay. --- x11-base/xorg-server/Manifest | 2 +- x11-base/xorg-server/xorg-server-9999.ebuild | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index d84884d..4f0ece3 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -9,4 +9,4 @@ AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd3022 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -EBUILD xorg-server-9999.ebuild 7041 RMD160 828d6c2cb04815cc76e40373c5a31cb138e43737 SHA1 546c3384624a7ba1324aa8329d772160f10c2460 SHA256 3398f69ecbf86a5e369ce7f653e5772fc87268559d052cd740aaa9513ff40a36 +EBUILD xorg-server-9999.ebuild 7123 RMD160 2eaec3575e6c5a0939c0fc6e8162c117e207a947 SHA1 00b6cd72da10a9569c50e6599519241368c9f91c SHA256 91fa3c94c267bba07e44b22e3f689f76fc92df914ba2f893b832fee1fbefc055 diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 81b83d4..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 @@ -132,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) -- 2.43.2