Update xorg-server for 1.1.1-r5

svn path=/; revision=199

9 files changed, 709 insertions, 15 deletions

diff --git a/hardened/xorg/x11-base/xorg-server/Manifest b/hardened/xorg/x11-base/xorg-server/Manifest
index 15bd260..3d05a4c 100644
--- a/hardened/xorg/x11-base/xorg-server/Manifest
+++ b/hardened/xorg/x11-base/xorg-server/Manifest
@@ -22,10 +22,6 @@ AUX 06-aiglx-happy-vt-switch.patch 6043 RMD160 fce467afaa3988b511b9796af164f3617
 MD5 e9248d96ffd078829f56f3d8075a5304 files/06-aiglx-happy-vt-switch.patch 6043
 RMD160 fce467afaa3988b511b9796af164f36172bf6b7b files/06-aiglx-happy-vt-switch.patch 6043
 SHA256 112f1cccc0f3e1af1d76109e845c0e89462b6e95c2fd1cc80ca9370806a617dc files/06-aiglx-happy-vt-switch.patch 6043
-AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 SHA1 387df8c7669b525fc7b041ce7574324680dbce48 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955
-MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447
-RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447
-SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447
 AUX 1.1.1-dbe-render.diff 5323 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 SHA1 67cfe51fdf314db3cf712cb180bdc7635788ffa3 SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab
 MD5 cffab2cec60a2af892e2853840cf2659 files/1.1.1-dbe-render.diff 5323
 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 files/1.1.1-dbe-render.diff 5323
@@ -54,6 +50,22 @@ AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdb
 MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 files/1.1.1-sparc64-ati-lockups.patch 652
+AUX 1.2.0-client-leak.patch 363 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a SHA1 67ee249858947cea7fcd9a08db3ff3e81cd0036e SHA256 5969bf63e88ab4030c6913237379b76fb55e9e1f249a058eb17487a4b7103b87
+MD5 c46eeebdde41ceb57f1dca6ef4b1a8b7 files/1.2.0-client-leak.patch 363
+RMD160 788a7468df4305319ee3a05137ce0b90e76b982a files/1.2.0-client-leak.patch 363
+SHA256 5969bf63e88ab4030c6913237379b76fb55e9e1f249a058eb17487a4b7103b87 files/1.2.0-client-leak.patch 363
+AUX 1.2.0-server-damage-version.patch 1322 RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 SHA1 129565a0151d42b85c43f273da507396111bdc9b SHA256 28a049c39e7995f7768eed34993f12252da416093e2f919c1ae84cb2dfee9f09
+MD5 789e294aaa7f8a03551f639dc022c568 files/1.2.0-server-damage-version.patch 1322
+RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 files/1.2.0-server-damage-version.patch 1322
+SHA256 28a049c39e7995f7768eed34993f12252da416093e2f919c1ae84cb2dfee9f09 files/1.2.0-server-damage-version.patch 1322
+AUX 1.2.0-server-randr-version.patch 444 RMD160 05a4c38c141bf5dddd1f94eb61dba62b79f17658 SHA1 5faef7578c55439433b10731c87d82536db7232b SHA256 226560c2d5c0c76987e2e315c2eef805e96ee9189aa3394148968fa13392f17e
+MD5 e14a71605039b6cded7ce9541ded2f1e files/1.2.0-server-randr-version.patch 444
+RMD160 05a4c38c141bf5dddd1f94eb61dba62b79f17658 files/1.2.0-server-randr-version.patch 444
+SHA256 226560c2d5c0c76987e2e315c2eef805e96ee9189aa3394148968fa13392f17e files/1.2.0-server-randr-version.patch 444
+AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
+MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
+RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
+SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
 AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
 MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
@@ -82,6 +94,10 @@ AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f23
 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
+AUX xorg-xserver-1.2.0-xcmisc.diff 981 RMD160 66afbb0d9c6017795c8a7537bd1d8e6000ba67e9 SHA1 3557cbe23be6912106ed7220d95301311fb93a26 SHA256 cc98577740689020020794c322069a5e2520bca8c0998efdab149994773ebba5
+MD5 0fa07a8fb2bc14fa01fc29e42b89c59e files/xorg-xserver-1.2.0-xcmisc.diff 981
+RMD160 66afbb0d9c6017795c8a7537bd1d8e6000ba67e9 files/xorg-xserver-1.2.0-xcmisc.diff 981
+SHA256 cc98577740689020020794c322069a5e2520bca8c0998efdab149994773ebba5 files/xorg-xserver-1.2.0-xcmisc.diff 981
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
@@ -96,9 +112,16 @@ EBUILD xorg-server-1.1.1-r4.ebuild 17622 RMD160 1a901dcb51deb474029204d79e04f6a2
 MD5 e3f2cb5180a1818f010ec89d87610dd3 xorg-server-1.1.1-r4.ebuild 17622
 RMD160 1a901dcb51deb474029204d79e04f6a281ae560e xorg-server-1.1.1-r4.ebuild 17622
 SHA256 7860bbeca535a7914910b1eefa0f3c084d2a3c5bbe189b24764723676c29acf3 xorg-server-1.1.1-r4.ebuild 17622
+EBUILD xorg-server-1.1.1-r5.ebuild 17669 RMD160 4d80d0d87f68fa1cc383e8fdf22b4c3d2d9df6c9 SHA1 e0c3ba6b4fe41654fcc6cd320dac6ef1aa90e1a9 SHA256 835f4821b2580e4d9d8e37b7c48502976c5c71830f3ce8502ce0f931465ade9e
+MD5 4d8616c0934501efe83f7ab543e246f3 xorg-server-1.1.1-r5.ebuild 17669
+RMD160 4d80d0d87f68fa1cc383e8fdf22b4c3d2d9df6c9 xorg-server-1.1.1-r5.ebuild 17669
+SHA256 835f4821b2580e4d9d8e37b7c48502976c5c71830f3ce8502ce0f931465ade9e xorg-server-1.1.1-r5.ebuild 17669
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r4 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r4 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r4 506
+MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r5 506
+RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r5 506
+SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r5 506
diff --git a/hardened/xorg/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch b/hardened/xorg/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
deleted file mode 100644
index 5a91db4..0000000
--- a/hardened/xorg/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:39	1.1
-+++ xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:52
-@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
- 
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
- 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
--	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
-+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
- 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
- 
- Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/hardened/xorg/x11-base/xorg-server/files/1.2.0-client-leak.patch b/hardened/xorg/x11-base/xorg-server/files/1.2.0-client-leak.patch
new file mode 100644
index 0000000..02e52db
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/1.2.0-client-leak.patch
@@ -0,0 +1,11 @@
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -1066,6 +1066,8 @@ CloseDownConnection(ClientPtr client)
+     XdmcpCloseDisplay(oc->fd);
+ #endif
+     CloseDownFileDescriptor(oc);
++    FreeOsBuffers(oc);
++    xfree(client->osPrivate);
+     client->osPrivate = (pointer)NULL;
+     if (auditTrailLevel > 1)
+         AuditF("client %d disconnected\n", client->index);
diff --git a/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-damage-version.patch b/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-damage-version.patch
new file mode 100644
index 0000000..e03ae0e
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-damage-version.patch
@@ -0,0 +1,38 @@
+--- a/damageext/damageext.c
++++ b/damageext/damageext.c
+@@ -35,6 +35,13 @@ int		DamageClientPrivateIndex;
+ RESTYPE		DamageExtType;
+ RESTYPE		DamageExtWinType;
+ 
++/* Version of the damage extension supported by the server, as opposed to the
++ * DAMAGE_* defines from damageproto for what version the proto header
++ * supports.
++ */
++#define SERVER_DAMAGE_MAJOR	1
++#define SERVER_DAMAGE_MINOR	0
++
+ #define prScreen	screenInfo.screens[0]
+ 
+ static void
+@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client)
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+-    if (stuff->majorVersion < DAMAGE_MAJOR) {
++    if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) {
+ 	rep.majorVersion = stuff->majorVersion;
+ 	rep.minorVersion = stuff->minorVersion;
+     } else {
+-	rep.majorVersion = DAMAGE_MAJOR;
+-	if (stuff->majorVersion == DAMAGE_MAJOR && 
+-	    stuff->minorVersion < DAMAGE_MINOR)
++	rep.majorVersion = SERVER_DAMAGE_MAJOR;
++	if (stuff->majorVersion == SERVER_DAMAGE_MAJOR && 
++	    stuff->minorVersion < SERVER_DAMAGE_MINOR)
+ 	    rep.minorVersion = stuff->minorVersion;
+ 	else
+-	    rep.minorVersion = DAMAGE_MINOR;
++	    rep.minorVersion = SERVER_DAMAGE_MINOR;
+     }
+     pDamageClient->major_version = rep.majorVersion;
+     pDamageClient->minor_version = rep.minorVersion;
diff --git a/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-randr-version.patch b/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-randr-version.patch
new file mode 100644
index 0000000..05432b6
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/1.2.0-server-randr-version.patch
@@ -0,0 +1,13 @@
+--- randr/randr.c.old	2007-02-19 14:01:55.000000000 -0700
++++ randr/randr.c	2007-02-19 14:02:12.000000000 -0700
+@@ -472,8 +472,8 @@
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+-    rep.majorVersion = RANDR_MAJOR;
+-    rep.minorVersion = RANDR_MINOR;
++    rep.majorVersion = 1;
++    rep.minorVersion = 1;
+     if (client->swapped) {
+     	swaps(&rep.sequenceNumber, n);
+     	swapl(&rep.length, n);
diff --git a/hardened/xorg/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch b/hardened/xorg/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
new file mode 100644
index 0000000..7d5b8ab
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2006-11-04 15:27:24.000000000 -0700
++++ configure.ac	2006-11-04 15:28:32.000000000 -0700
+@@ -1342,7 +1342,7 @@
+ 
+ 	dnl these only go in xorg-config.h
+ 	XF86CONFIGFILE="xorg.conf"
+-	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
++	CONFIGFILE="$sysconfdir/X11/$XF86CONFIGFILE"
+ 	LOGPREFIX="$logdir/Xorg."
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
diff --git a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r5 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r5
new file mode 100644
index 0000000..1330edc
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r5
@@ -0,0 +1,6 @@
+MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
+RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
+SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
+MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
+RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
+SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff b/hardened/xorg/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
new file mode 100644
index 0000000..b67d2ee
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
@@ -0,0 +1,38 @@
+diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
+index f26218e..8c7a86e 100644
+--- a/Xext/xcmisc.c
++++ b/Xext/xcmisc.c
+@@ -42,6 +42,12 @@ #include "swaprep.h"
+ #include <X11/extensions/xcmiscstr.h>
+ #include "modinit.h"
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ #if 0
+ static unsigned char XCMiscCode;
+ #endif
+@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
+ 
+     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
+ 
+-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
++    if (stuff->count > UINT32_MAX / sizeof(XID))
++	    return BadAlloc;
++
++    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
+     if (!pids)
+     {
+ 	return BadAlloc;
+@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
+     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
+ 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
+     }
+-    DEALLOCATE_LOCAL(pids);
++    Xfree(pids);
+     return(client->noClientException);
+ }
+ 
diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild
new file mode 100644
index 0000000..34fd85f
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild
@@ -0,0 +1,565 @@
+# Copyright 1999-2007 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.1.1-r5.ebuild,v 1.1 2007/04/05 07:00:19 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.5.1"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
+#RESTRICT="stricter"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE_INPUT_DEVICES="
+	input_devices_acecad
+	input_devices_aiptek
+	input_devices_calcomp
+	input_devices_citron
+	input_devices_digitaledge
+	input_devices_dmc
+	input_devices_dynapro
+	input_devices_elo2300
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_fpit
+	input_devices_hyperpen
+	input_devices_jamstudio
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_magellan
+	input_devices_microtouch
+	input_devices_mouse
+	input_devices_mutouch
+	input_devices_palmax
+	input_devices_penmount
+	input_devices_spaceorb
+	input_devices_summa
+	input_devices_tek4957
+	input_devices_ur98
+	input_devices_vmmouse
+	input_devices_void
+
+	input_devices_synaptics
+	input_devices_wacom"
+IUSE_VIDEO_CARDS="
+	video_cards_apm
+	video_cards_ark
+	video_cards_chips
+	video_cards_cirrus
+	video_cards_cyrix
+	video_cards_dummy
+	video_cards_epson
+	video_cards_fbdev
+	video_cards_glint
+	video_cards_i128
+	video_cards_i740
+	video_cards_i810
+	video_cards_impact
+	video_cards_imstt
+	video_cards_mach64
+	video_cards_mga
+	video_cards_neomagic
+	video_cards_newport
+	video_cards_nsc
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_rendition
+	video_cards_s3
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_siliconmotion
+	video_cards_sis
+	video_cards_sisusb
+	video_cards_sunbw2
+	video_cards_suncg14
+	video_cards_suncg3
+	video_cards_suncg6
+	video_cards_sunffb
+	video_cards_sunleo
+	video_cards_suntcx
+	video_cards_tdfx
+	video_cards_tga
+	video_cards_trident
+	video_cards_tseng
+	video_cards_v4l
+	video_cards_vesa
+	video_cards_vga
+	video_cards_via
+	video_cards_vmware
+	video_cards_voodoo
+
+	video_cards_fglrx
+	video_cards_nvidia"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
+	3dfx
+	aiglx
+	dri ipv6 minimal nptl sdl xprint"
+RDEPEND="x11-libs/libXfont
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXi
+	media-libs/freetype
+	>=media-libs/mesa-6.5-r2
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	dmx? ( x11-libs/libdmx )
+	!minimal? ( x11-libs/libXtst
+		x11-libs/libXres )
+	>=x11-libs/libxkbui-1.0.2
+	x11-libs/liblbxutil
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
+	# Xaw is dmx- and xorgcfg-dependent
+	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# liblbxutil is lbx- dependent
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	>=x11-proto/fixesproto-4
+	x11-proto/damageproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86rushproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86bigfontproto
+	>=x11-proto/compositeproto-0.3
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/videoproto
+	>=x11-proto/scrnsaverproto-1.1.0
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	>=x11-proto/kbproto-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	>=x11-proto/glproto-1.4.8
+	dmx? ( x11-proto/dmxproto )
+	dri? ( x11-proto/xf86driproto
+		>=x11-libs/libdrm-2 )
+	xprint? ( x11-proto/printproto
+		x11-apps/mkfontdir
+		x11-apps/mkfontscale
+		x11-apps/xplsprinters )"
+
+# Drivers
+PDEPEND="
+	xorg? (
+		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
+		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
+		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
+		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
+		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
+		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
+		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
+		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
+		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
+		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
+		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
+		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
+		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
+		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
+		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
+		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
+		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
+		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
+		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
+		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
+		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
+		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
+		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
+		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
+		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
+		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
+		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
+
+		input_devices_synaptics? ( x11-drivers/synaptics )
+		input_devices_wacom? ( x11-drivers/linuxwacom )
+
+		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
+		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
+		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
+		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
+		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
+		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
+		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
+		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
+		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
+		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
+		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
+		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
+		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
+		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
+		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
+		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
+		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
+		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
+		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
+		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
+		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
+		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
+		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
+		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
+		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
+		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
+		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
+		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
+		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
+		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
+		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
+		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
+		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
+		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
+		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
+		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
+		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
+		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
+		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
+		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
+		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
+		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
+
+		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
+		video_cards_nvidia? ( || (
+				>=x11-drivers/nvidia-drivers-1.0.8774
+				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
+			)
+		)
+	)"
+LICENSE="${LICENSE} MIT"
+
+pkg_setup() {
+	use minimal || ensure_a_server_is_building
+
+	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
+		${FILESDIR}/${P}-install-libxf86config-headers.patch
+		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
+		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
+		${FILESDIR}/xorg-conf-example.patch
+		${FILESDIR}/${PV}-fix_acpi_tokenize.patch
+		${FILESDIR}/${PV}-fixdualhead.patch
+		${FILESDIR}/${PV}-sparc-includes.patch
+		${FILESDIR}/xorg-xserver-1.2.0-xcmisc.diff
+		${FILESDIR}/${PV}-dbe-render.diff"
+
+	# Patches required for compiz to work with AIGLX,
+	# but they slow EXA down (bug #147841).
+	if use aiglx; then
+		einfo "AIGLX patches will be applied."
+		ewarn "These patches are known to cause problems with EXA enabled."
+		PATCHES="${FILESDIR}/01-no-move-damage.patch
+			${FILESDIR}/02-dont-backfill-bg-none.patch
+			${FILESDIR}/03-tfp-damage.patch
+			${FILESDIR}/04-mesa-copy-sub-buffer.patch
+			${FILESDIR}/05-offscreen-pixmaps.patch
+			${FILESDIR}/06-aiglx-happy-vt-switch.patch
+			${FILESDIR}/${PV}-fix_big_endian_glx.patch
+			${PATCHES}"
+	fi
+
+	if use hardened; then
+		# Patches to make it bind-now
+		einfo "Hardened patches will be applied."
+		PATCHES="${FILESDIR}/${P}-glx-needs-GLcore.patch
+			${FILESDIR}/${P}-dri-weak-glx.patch
+			${PATCHES}"
+	fi
+
+	# SDL only available in kdrive build
+	if use kdrive && use sdl; then
+		conf_opts="${conf_opts} --enable-xsdl"
+	else
+		conf_opts="${conf_opts} --disable-xsdl"
+	fi
+
+	# Only Xorg and Xgl support this, and we won't build Xgl
+	# until it merges to trunk
+	if use xorg; then
+		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
+	fi
+
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable !minimal xorgcfg)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable dri)
+		$(use_enable xorg)
+		$(use_enable xprint)
+		$(use_enable nptl glx-tls)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		${conf_opts}"
+
+	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
+	if built_with_use media-libs/mesa nptl; then
+		use nptl || die "${diemsg}"
+	else
+		use nptl && die "${diemsg}"
+	fi
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Nothing else provides new enough glxtokens.h
+	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_unpack() {
+	x-modular_specs_check
+	x-modular_dri_check
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	# Set up kdrive servers to build
+	if use kdrive; then
+		kdrive_setup
+	fi
+
+	# Make sure eautoreconf gets run if we need the autoconf/make
+	# changes.
+	if [[ ${SNAPSHOT} != "yes" ]]; then
+		if use kdrive || use xprint; then
+			eautoreconf
+		fi
+	fi
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	# Install video mode files for system-config-display
+	insinto /usr/share/xorg
+	doins hw/xfree86/common/{extra,vesa}modes \
+		|| die "couldn't install extra modes"
+
+	# Bug #151421 - this file is not built with USE="minimal"
+	# Bug #151670 - this file is also not build if USE="-xorg"
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+
+	# Bug #135544
+	ewarn "Users of reduced blanking now need:"
+	ewarn "   Option \"ReducedBlanking\""
+	ewarn "In the relevant Monitor section(s)."
+	ewarn "Make sure your reduced blanking modelines are safe!"
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+kdrive_setup() {
+	local card real_card disable_card kdrive_fbdev kdrive_vesa
+
+	einfo "Removing unused kdrive drivers ..."
+
+	# Some kdrive servers require fbdev and vesa
+	kdrive_fbdev="radeon neomagic sis siliconmotion"
+	# Some kdrive servers require just vesa
+	kdrive_vesa="chips mach64 mga nv glint r128 via"
+
+	for card in ${IUSE_VIDEO_CARDS}; do
+		real_card=${card#video_cards_}
+
+		# Differences between VIDEO_CARDS name and kdrive server name
+		real_card=${real_card/glint/pm2}
+		real_card=${real_card/radeon/ati}
+		real_card=${real_card/%nv/nvidia}
+		real_card=${real_card/siliconmotion/smi}
+		real_card=${real_card/%sis/sis300}
+
+		disable_card=0
+
+		# Check whether it's a valid kdrive server before we waste time
+		# on the rest of this
+		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+			continue
+		fi
+
+		if ! use ${card}; then
+			if use x86; then
+				# Some kdrive servers require fbdev and vesa
+				for i in ${kdrive_fbdev}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = fbdev ]] \
+							|| [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+						fi
+				done
+
+				# Some kdrive servers require just vesa
+				for i in ${kdrive_vesa}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+					fi
+				done
+			fi
+			disable_card=1
+		# Bug #150052
+		# fbdev is the only VIDEO_CARDS setting that works on non-x86
+		elif ! use x86 \
+			&& [[ ${real_card} != fbdev ]]; then
+			ewarn "  $real_card does not work on your architecture; disabling."
+			disable_card=1
+		fi
+
+		if [[ $disable_card = 1 ]]; then
+			ebegin "  ${real_card}"
+			sed -i \
+				-e "s:\b${real_card}\b::g" \
+				${S}/hw/kdrive/Makefile.am \
+				|| die "sed of ${real_card} failed"
+			eend
+		fi
+
+	done
+
+	# smi and via are the only things on line 2. If line 2 ends up blank,
+	# we need to get rid of the backslash at the end of line 1.
+	if ! use video_cards_siliconmotion && ! use video_cards_via; then
+		sed -i \
+			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
+			${S}/hw/kdrive/Makefile.am
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	use xprint && xprint_src_install
+
+	if ! use xorg; then
+		rm ${D}/usr/share/man/man1/Xserver.1x \
+			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
+			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			${D}/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/Xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
+		92xprint-xpserverlist.sh
+	# Patch profile scripts
+	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
+		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
+		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
+	dodoc ${D}/etc/profile.d/xprint*
+	rm -f ${D}/etc/profile.d/xprint*
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}