(#183721) Fix resizing with RandR. (#179545) Use correct screen resolutions when there's multiple screens. (#191709) Require older libXrender too. (#192312) Export ramdac symbols, so e.g. xf86-video-s3 compiles. (#193207) Fix Xephyr segfault on amd64. (#194026) Set XKB output directory so this works with xkeyboard-config 1.1.

(Portage version: 2.1.3.12)

7 files changed, 801 insertions, 1 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0b4880e98590..08cb1963dda8 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.288 2007/10/09 08:32:42 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.289 2007/10/13 20:52:35 dberkholz Exp $
+
+*xorg-server-1.3.0.0-r2 (13 Oct 2007)
+
+  13 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.3.0.0-fix-dual-head-screen-resolutions.patch,
+  +files/1.3.0.0-fix-randr-resizing.patch,
+  +files/1.3.0.0-fix-xephyr-amd64-segfault.patch,
+  +files/1.3.0.0-ramdac.patch, +xorg-server-1.3.0.0-r2.ebuild:
+  (#183721) Fix resizing with RandR. (#179545) Use correct screen resolutions
+  when there's multiple screens. (#191709) Require older libXrender too.
+  (#192312) Export ramdac symbols, so e.g. xf86-video-s3 compiles. (#193207)
+  Fix Xephyr segfault on amd64. (#194026) Set XKB output directory so this
+  works with xkeyboard-config 1.1.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -xorg-server-1.4-r1.ebuild:
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
new file mode 100644
index 000000000000..c5b957147778
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
@@ -0,0 +1,49 @@
+Title       : x11-base/xorg-server-1.3.0.0 uses wrong screen resolutions on a dual-head systems
+Assignee    : x11@gentoo.org
+Reported    : 2007-05-23 16:53 0000
+Updated     : 2007-10-02 19:39:28 0000
+Status      : NEW
+Severity    : normal
+Priority    : P2
+Reporter    : jouni.rinne@pp1.inet.fi
+Product     : Gentoo Linux
+Component   : Server
+Keywords    : Inclusion
+CC          : bas@lijer.nl
+CC          : daniel.pielmeier@googlemail.com
+CC          : frlinux@frlinux.net
+CC          : ml81@gmx.de
+Comments    : 14
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=179545
+
+commit 9c80eda826448822328bb678a7d284cc43fffb17
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Wed Apr 25 16:35:04 2007 -0400
+
+    Disable RANDR's fake Xinerama protocol when there's more than one screen.
+
+    ... in the protocol sense.  Xinerama doesn't have any provision for more
+    than one protocol screen each with its own geometry.
+
+    Red Hat bug #231257.
+
+diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
+index 1db27f1..2a57e4e 100644
+--- a/randr/rrxinerama.c
++++ b/randr/rrxinerama.c
+@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void)
+ 	return;
+ #endif
+ 
++    /*
++     * Xinerama isn't capable enough to have multiple protocol screens each
++     * with their own output geometry.  So if there's more than one protocol
++     * screen, just don't even try.
++     */
++    if (screenInfo.numScreens > 1)
++	return;
++
+     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
+ 			ProcRRXineramaDispatch,
+ 			SProcRRXineramaDispatch,
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
new file mode 100644
index 000000000000..48286996c72e
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
@@ -0,0 +1,58 @@
+Title       : xorg-server-1.3: desktop does not resize with RandR
+Assignee    : x11@gentoo.org
+Reported    : 2007-06-30 11:37 0000
+Updated     : 2007-10-06 08:32:58 0000
+Status      : ASSIGNED
+Severity    : normal
+Priority    : P2
+Reporter    : sascha.lucas@rus.uni-stuttgart.de
+Product     : Gentoo Linux
+Component   : KDE
+Keywords    : Inclusion
+CC          : caster@gentoo.org
+CC          : chrschmitt@gmail.com
+CC          : gentoo@chlhp.de
+CC          : kde@gentoo.org
+Comments    : 14
+Attachments : 0
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=183721
+
+commit c10df5b967d4da4e11786520317e2917de5541fa
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 3 15:47:01 2007 -0700
+
+    Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
+
+    RandR 1.1 clients expect the size fields in this event to be the unrotated
+    dimensions of the screen.  This behavior is "weird", but that's the way the old
+    code worked so we need to be bug-compatible with it.
+
+diff --git a/randr/rrscreen.c b/randr/rrscreen.c
+index ad74ac3..f83fce3 100644
+--- a/randr/rrscreen.c
++++ b/randr/rrscreen.c
+@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
+ 
+     se.sequenceNumber = client->sequence;
+     se.sizeID = RR10CurrentSizeID (pScreen);
+-    
+-    se.widthInPixels = pScreen->width;
+-    se.heightInPixels = pScreen->height;
+-    se.widthInMillimeters = pScreen->mmWidth;
+-    se.heightInMillimeters = pScreen->mmHeight;
++
++    if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
++	se.widthInPixels = pScreen->height;
++	se.heightInPixels = pScreen->width;
++	se.widthInMillimeters = pScreen->mmHeight;
++	se.heightInMillimeters = pScreen->mmWidth;
++    } else {
++	se.widthInPixels = pScreen->width;
++	se.heightInPixels = pScreen->height;
++	se.widthInMillimeters = pScreen->mmWidth;
++	se.heightInMillimeters = pScreen->mmHeight;
++    }
++
+     WriteEventsToClient (client, 1, (xEvent *) &se);
+ }
+ 
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
new file mode 100644
index 000000000000..c8fdfedb3cf9
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
@@ -0,0 +1,45 @@
+Title       : x11-base/xorg-server-1.3.0.0 Xephyr segfaults on startup on amd64
+Assignee    : x11@gentoo.org
+Reported    : 2007-09-20 17:22 0000
+Updated     : 2007-09-20 17:52:21 0000
+Status      : NEW
+URL         : https://bugs.freedesktop.org/show_bug.cgi?id=11582
+Severity    : normal
+Priority    : P2
+Reporter    : chithanh@cs.tu-berlin.de
+Product     : Gentoo Linux
+Component   : Server
+Keywords    : Inclusion
+Comments    : 2
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=193207
+
+commit dcc3de91d2b80be98e4488df29ec6b551c7ff6d1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Aug 18 11:50:33 2007 +0200
+
+    Xephyr: fix immediat segfault on amd64
+
+    This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582
+
+diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
+index d0a2f2f..12118da 100644
+--- a/hw/kdrive/ephyr/hostx.c
++++ b/hw/kdrive/ephyr/hostx.c
+@@ -40,6 +40,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>
+ #include <X11/extensions/XShm.h>
++#include <X11/Xmd.h>
+ 
+ /*  
+  * All xlib calls go here, which gets built as its own .a .
+@@ -79,7 +80,7 @@ static int            HostXWantDamageDebug = 0;
+ 
+ extern KeySym         EphyrKeymap[];
+ 
+-extern KeySym	      kdKeymap[];
++extern CARD32	      kdKeymap[];
+ extern int	      kdMinScanCode;
+ extern int	      kdMaxScanCode;
+ extern int	      kdMinKeyCode;
diff --git a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
new file mode 100644
index 000000000000..37ab1b77c0a8
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
@@ -0,0 +1,91 @@
+Title       : xorg-server-1.3: xf86-video-s3 - s3_drv.so: undefined symbol: RamDacInit
+Assignee    : x11@gentoo.org
+Reported    : 2007-09-12 15:53 0000
+Updated     : 2007-10-06 08:34:19 0000
+Status      : NEW
+Severity    : normal
+Priority    : P2
+Reporter    : dpblnt@gmail.com
+Product     : Gentoo Linux
+Component   : Applications
+Keywords    : Inclusion
+Comments    : 3
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=192312
+
+commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue May 29 22:01:30 2007 -0400
+
+    Make sure that the ramdac symbols are present in the server
+    
+    The former ramdac module is now built into the server, so its symbols need to
+    be explicitly exported to drivers (Debian #423129).
+
+diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
+index 5175f01..6535e4c 100644
+--- a/hw/xfree86/loader/xf86sym.c
++++ b/hw/xfree86/loader/xf86sym.c
+@@ -96,6 +96,11 @@
+ #endif
+ #include "xf86DDC.h"
+ #include "edid.h"
++#include "xf86Cursor.h"
++#include "xf86RamDac.h"
++#include "BT.h"
++#include "IBM.h"
++#include "TI.h"
+ 
+ #ifndef HAS_GLIBC_SIGSETJMP
+ #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
+@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
+     SYMFUNC(xf86I2CWriteRead)
+     SYMFUNC(xf86I2CWriteVec)
+     SYMFUNC(xf86I2CWriteWord)
++
++    /* ramdac/xf86RamDac.c */
++    SYMFUNC(RamDacCreateInfoRec)
++    SYMFUNC(RamDacHelperCreateInfoRec)
++    SYMFUNC(RamDacDestroyInfoRec)
++    SYMFUNC(RamDacHelperDestroyInfoRec)
++    SYMFUNC(RamDacInit)
++    SYMFUNC(RamDacHandleColormaps)
++    SYMFUNC(RamDacFreeRec)
++    SYMFUNC(RamDacGetHWIndex)
++    SYMVAR(RamDacHWPrivateIndex)
++    SYMVAR(RamDacScreenPrivateIndex)
++
++    /* ramdac/xf86Cursor.c */
++    SYMFUNC(xf86InitCursor)
++    SYMFUNC(xf86CreateCursorInfoRec)
++    SYMFUNC(xf86DestroyCursorInfoRec)
++    SYMFUNC(xf86ForceHWCursor)
++
++    /* ramdac/BT.c */
++    SYMFUNC(BTramdacProbe)
++    SYMFUNC(BTramdacSave)
++    SYMFUNC(BTramdacRestore)
++    SYMFUNC(BTramdacSetBpp)
++
++    /* ramdac/IBM.c */
++    SYMFUNC(IBMramdacProbe)
++    SYMFUNC(IBMramdacSave)
++    SYMFUNC(IBMramdacRestore)
++    SYMFUNC(IBMramdac526SetBpp)
++    SYMFUNC(IBMramdac640SetBpp)
++    SYMFUNC(IBMramdac526CalculateMNPCForClock)
++    SYMFUNC(IBMramdac640CalculateMNPCForClock)
++    SYMFUNC(IBMramdac526HWCursorInit)
++    SYMFUNC(IBMramdac640HWCursorInit)
++    SYMFUNC(IBMramdac526SetBppWeak)
++
++    /* ramdac/TI.c */
++    SYMFUNC(TIramdacCalculateMNPForClock)
++    SYMFUNC(TIramdacProbe)
++    SYMFUNC(TIramdacSave)
++    SYMFUNC(TIramdacRestore)
++    SYMFUNC(TIramdac3026SetBpp)
++    SYMFUNC(TIramdac3030SetBpp)
++    SYMFUNC(TIramdacHWCursorInit)
++    SYMFUNC(TIramdacLoadPalette)
+ };
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r2
new file mode 100644
index 000000000000..e7c3cc0974cc
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r2
@@ -0,0 +1,6 @@
+MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
+RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
+SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
+MD5 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 5968263
+RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 xorg-server-1.3.0.0.tar.bz2 5968263
+SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975 xorg-server-1.3.0.0.tar.bz2 5968263
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild
new file mode 100644
index 000000000000..edd73716134c
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild
@@ -0,0 +1,538 @@
+# 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.3.0.0-r2.ebuild,v 1.1 2007/10/13 20:52:35 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.2"
+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"
+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
+	dri ipv6 minimal nptl sdl xprint"
+RDEPEND=">=x11-libs/libXfont-1.2.5
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	<x11-libs/libXrender-0.9.3
+	x11-libs/libXi
+	media-libs/freetype
+	>=media-libs/mesa-6.5.2
+	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
+			x11-libs/libXfixes )
+	!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-1.2.1
+	<x11-proto/renderproto-0.9.3
+	>=x11-proto/fixesproto-4
+	>=x11-proto/damageproto-1.1
+	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.3
+	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.3 )
+	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* )
+		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_nvidia? ( x11-drivers/nvidia-drivers )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
+	)"
+LICENSE="${LICENSE} MIT"
+
+PATCHES="
+	${FILESDIR}/${PV}-fix-dual-head-screen-resolutions.patch
+	${FILESDIR}/${PV}-fix-randr-resizing.patch
+	${FILESDIR}/${PV}-fix-xephyr-amd64-segfault.patch
+	${FILESDIR}/${PV}-ramdac.patch
+	${FILESDIR}/use-composite-for-unequal-depths.patch
+	${FILESDIR}/1.2.0-fix-amd-cpu-detection.patch
+	${FILESDIR}/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
+	${FILESDIR}/1.2.0-typo-fix.patch
+	${FILESDIR}/1.2.0-zero-out-client-devprivates-on-allocation.patch
+	${FILESDIR}/${PV}-use-proc-instead-of-sys.patch
+	${FILESDIR}/avoid-crash-on-minimized-xv-window.patch
+	${FILESDIR}/xorg-server-sam225bw-quirks.patch
+	${FILESDIR}/1.3-alpha-build-fix.patch
+	${FILESDIR}/${PV}-xephyr_crash_at_exit.patch
+	${FILESDIR}/xorg-x11-server-1.0.1-fpic-libxf86config.patch
+	"
+
+pkg_setup() {
+	use minimal || ensure_a_server_is_building
+
+	# 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 install-libxf86config)
+		$(use_enable dri)
+		$(use_enable xorg)
+		$(use_enable xprint)
+		$(use_enable nptl glx-tls)
+		$(use_enable !minimal xorgcfg)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		${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; 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}"/hw/xprint/etc/init.d/xprint
+	# Install the wrapper
+	newinitd "${FILESDIR}"/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	# 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
+	# 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."
+}