Fix several issues:

Bug #163613 - Server should report its damage implementation version rather
than the protocol header version.  (Todd Merrill)

Bug #164146 - Xprint file locations have changed since 1.1, so fix the ebuild
to find them correctly.  (Ed Catmur)

Bug #167651 - Server should report its randr implementation version rather
than the protocol header version.  (Me)
Package-Manager: portage-2.1.2-r9

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 5ee24990700a4a061e4e78267393754cc9ab975b..01538b20e94eee7be49f55c55cfc8fb753e507b4 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,22 @@
 # 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.218 2007/01/24 06:34:12 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.219 2007/02/19 21:34:17 joshuabaergen Exp $
+
+*xorg-server-1.2.0-r1 (19 Feb 2007)
+
+  19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.2.0-server-damage-version.patch,
+  +files/1.2.0-server-randr-version.patch, +xorg-server-1.2.0-r1.ebuild:
+  Fix several issues:
+  
+  Bug #163613 - Server should report its damage implementation version rather
+  than the protocol header version.  (Todd Merrill)
+  
+  Bug #164146 - Xprint file locations have changed since 1.1, so fix the ebuild
+  to find them correctly.  (Ed Catmur)
+  
+  Bug #167651 - Server should report its randr implementation version rather
+  than the protocol header version.  (Me)
 
   24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -files/1.0.2-Xprint-xprintdir.patch, -files/1.0.2-dbe-render.diff,

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3fc01daf43f02417f7c7bc2417fc868af47c3d1c..d305713746ab9d391a5dab467a6dff92a2c2cd19 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
 MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
@@ -53,6 +50,14 @@ 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-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
@@ -86,6 +91,10 @@ EBUILD xorg-server-1.1.1-r4.ebuild 17412 RMD160 19773e74e27b3e3476bfae616872d385
 MD5 a20852b84c8e7073ef035e4834038c5e xorg-server-1.1.1-r4.ebuild 17412
 RMD160 19773e74e27b3e3476bfae616872d38545eb0c6f xorg-server-1.1.1-r4.ebuild 17412
 SHA256 e0b28db46a8a86dbcda5aca5e82ec5a208317fcef9987d31a421b3a1c975e8d2 xorg-server-1.1.1-r4.ebuild 17412
+EBUILD xorg-server-1.2.0-r1.ebuild 16409 RMD160 2571d3536964fbb242bb6a3c3ed9bca1b3c68166 SHA1 3a9c89dfcab89388c2d513e79f592e0d22edc96c SHA256 85f71bea4599038caec0ceb082516bca85fc5d57fe491320b25f714cf19396fe
+MD5 01cd4e93c803280878c0ac9d52eb1109 xorg-server-1.2.0-r1.ebuild 16409
+RMD160 2571d3536964fbb242bb6a3c3ed9bca1b3c68166 xorg-server-1.2.0-r1.ebuild 16409
+SHA256 85f71bea4599038caec0ceb082516bca85fc5d57fe491320b25f714cf19396fe xorg-server-1.2.0-r1.ebuild 16409
 EBUILD xorg-server-1.2.0.ebuild 16451 RMD160 126d3e4450523932ab1a921c55dce2f521cebedd SHA1 ed590af811ddf8ea72748500803b8e52e23c5420 SHA256 3edddd3839e46909ae9f0cc843f6a13197b78786f0ae8e7fe1082df5b272d91e
 MD5 fcd4f030381376c4752c7edce936cbcf xorg-server-1.2.0.ebuild 16451
 RMD160 126d3e4450523932ab1a921c55dce2f521cebedd xorg-server-1.2.0.ebuild 16451
@@ -94,10 +103,10 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
-MISC ChangeLog 45933 RMD160 42c03fb4204c9bb599d59b545b926bcd85ad8556 SHA1 b7986783571d47ac1f424b21ded22f28c144901c SHA256 67a9e97076ef25b08dae8b3684815c60aa201686ceecfec19bd6e44c8fd2257e
-MD5 dc00da6adac08221455303e64fa14ea2 ChangeLog 45933
-RMD160 42c03fb4204c9bb599d59b545b926bcd85ad8556 ChangeLog 45933
-SHA256 67a9e97076ef25b08dae8b3684815c60aa201686ceecfec19bd6e44c8fd2257e ChangeLog 45933
+MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7
+MD5 e31a590302270c7d0072ec4c5e2b8cde ChangeLog 46548
+RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed ChangeLog 46548
+SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7 ChangeLog 46548
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -111,13 +120,9 @@ SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/di
 MD5 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0 506
 RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0 506
 SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0 506
+MD5 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0-r1 506
+RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0-r1 506
+SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0-r1 506
 MD5 308173d8f7a2f60835b95ce92bd47e77 files/digest-xorg-server-1.2.99.0 515
 RMD160 e45f1b4e020b0cc57f5cb4ff3fd511c05e286540 files/digest-xorg-server-1.2.99.0 515
 SHA256 c1013b629f0a3186dc286d28768fdfd34261c14b07d08e52d4149a32875302c8 files/digest-xorg-server-1.2.99.0 515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzvYM8bi6rjpTunYRAljLAJ9TDebIoTYjiUnksgTkwPqMf/htjwCgxLWe
-/+FRSYXUbLzlAM/qAG9VWTc=
-=5UvV
------END PGP SIGNATURE-----

diff --git a/x11-base/xorg-server/files/1.2.0-server-damage-version.patch b/x11-base/xorg-server/files/1.2.0-server-damage-version.patch
new file mode 100644 (file)
index 0000000..e03ae0e
--- /dev/null
+++ b/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/x11-base/xorg-server/files/1.2.0-server-randr-version.patch b/x11-base/xorg-server/files/1.2.0-server-randr-version.patch
new file mode 100644 (file)
index 0000000..05432b6
--- /dev/null
+++ b/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/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r1
new file mode 100644 (file)
index 0000000..a78fe15
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r1
@@ -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 ea291c89e68832d570d9d5e007218bd6 xorg-server-1.2.0.tar.bz2 6014596
+RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 xorg-server-1.2.0.tar.bz2 6014596
+SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 xorg-server-1.2.0.tar.bz2 6014596

diff --git a/x11-base/xorg-server/xorg-server-1.2.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.2.0-r1.ebuild
new file mode 100644 (file)
index 0000000..0b9a64a
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.2.0-r1.ebuild
@@ -0,0 +1,529 @@
+# 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.2.0-r1.ebuild,v 1.1 2007/02/19 21:34:17 joshuabaergen 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"
+# 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
+       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
+       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 )
+       !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.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.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"
+
+PATCHES="${FILESDIR}/${PV}-server-damage-version.patch
+       ${FILESDIR}/${PV}-server-randr-version.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
+               ${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."
+}