(#194026) Fix many keyboard-related issues, particularly special keys, by setting the XKB output directory to one that actually exists -- /var/lib/xkb -- instead of /usr/share/X11/xkb/compiled (illusion). (#193978) Fix build on ia64 (Raúl Porcel). (#193735) Another xprint fix, to the init script this time (Andy Crook).

Package-Manager: portage-2.1.3.9

5 files changed, 650 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 642670d25b07..5ead2384eb53 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,16 @@
 # 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.280 2007/10/01 00:37:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.281 2007/10/01 10:31:56 dberkholz Exp $
+
+*xorg-server-1.4-r2 (01 Oct 2007)
+
+  01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-ia64.patch, +xorg-server-1.4-r2.ebuild:
+  (#194026) Fix many keyboard-related issues, particularly special keys, by
+  setting the XKB output directory to one that actually exists -- /var/lib/xkb
+  -- instead of /usr/share/X11/xkb/compiled (illusion). (#193978) Fix build on
+  ia64 (Raúl Porcel). (#193735) Another xprint fix, to the init script this
+  time (Andy Crook).
 
   01 Oct 2007; Joshua Kinard <kumba@gentoo.org>
   xorg-server-1.3.0.0-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cca864b930a5..b7c4d97e06e3 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -66,6 +69,10 @@ AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e
 MD5 23c038451c338040cc456b61998f8cbe files/1.4-fpic-libxf86config.patch 374
 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 files/1.4-fpic-libxf86config.patch 374
 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 files/1.4-fpic-libxf86config.patch 374
+AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
+MD5 563b0bd3cf629594784af3044351224a files/1.4-ia64.patch 1872
+RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c files/1.4-ia64.patch 1872
+SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec files/1.4-ia64.patch 1872
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 MD5 c5f6f5dad5315cd737565bfbc58ff862 files/avoid-crash-on-minimized-xv-window.patch 1970
 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 files/avoid-crash-on-minimized-xv-window.patch 1970
@@ -111,10 +118,14 @@ EBUILD xorg-server-1.4-r1.ebuild 17744 RMD160 2949e3b6788a90930417d5992e07f19527
 MD5 b20fa97c5dceb441daf94054d58c7634 xorg-server-1.4-r1.ebuild 17744
 RMD160 2949e3b6788a90930417d5992e07f19527925433 xorg-server-1.4-r1.ebuild 17744
 SHA256 859933442e285bc243ea34b809ba3c184a7efe4b733e30bb0bfc11aa233ca326 xorg-server-1.4-r1.ebuild 17744
-MISC ChangeLog 59275 RMD160 0dcfe66e2947f336b5733f5fe87fea09a5f9ca25 SHA1 e19c140235532960215875329a60271597e8f499 SHA256 3276af688eb415d1df5c2814d576adf574c903c637e979f2bf619fa9865e99d6
-MD5 99a26dd93751c30ae6b683de019c9b35 ChangeLog 59275
-RMD160 0dcfe66e2947f336b5733f5fe87fea09a5f9ca25 ChangeLog 59275
-SHA256 3276af688eb415d1df5c2814d576adf574c903c637e979f2bf619fa9865e99d6 ChangeLog 59275
+EBUILD xorg-server-1.4-r2.ebuild 17809 RMD160 b0cc1f1eb923daf0078d6379dd0916f3e463b628 SHA1 ab87dc5cbc8fb7bf2f299aa5f862ebcf13fe1e5a SHA256 b3ea842e941c1ed3f22649122339fe98bb78db40ef14ae071abc9e3645f998a1
+MD5 438c2b225262ec84deda12b7fea76656 xorg-server-1.4-r2.ebuild 17809
+RMD160 b0cc1f1eb923daf0078d6379dd0916f3e463b628 xorg-server-1.4-r2.ebuild 17809
+SHA256 b3ea842e941c1ed3f22649122339fe98bb78db40ef14ae071abc9e3645f998a1 xorg-server-1.4-r2.ebuild 17809
+MISC ChangeLog 59755 RMD160 27493edf57c59ac8e05e949664b778132a325800 SHA1 449c861798dbbe2d239f46da85f82b84ad61b40e SHA256 259d9989e004d1303fd412b466e040af23f91b5665dc3417765c75cafa5b409d
+MD5 6494101dd8bbceb31dc5556fe51c2990 ChangeLog 59755
+RMD160 27493edf57c59ac8e05e949664b778132a325800 ChangeLog 59755
+SHA256 259d9989e004d1303fd412b466e040af23f91b5665dc3417765c75cafa5b409d ChangeLog 59755
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -131,3 +142,13 @@ SHA256 ae8d04a5e64f7aedd5cc910085a1db5ce1638012a3bfedeab142ce99b0d3968a files/di
 MD5 a786bf92e7f6a676ca17c72643400702 files/digest-xorg-server-1.4-r1 500
 RMD160 d88df94e7c8c7a0e16aff8d597ce8e7e570331b2 files/digest-xorg-server-1.4-r1 500
 SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/digest-xorg-server-1.4-r1 500
+MD5 a786bf92e7f6a676ca17c72643400702 files/digest-xorg-server-1.4-r2 500
+RMD160 d88df94e7c8c7a0e16aff8d597ce8e7e570331b2 files/digest-xorg-server-1.4-r2 500
+SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/digest-xorg-server-1.4-r2 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHAMyjXVaO67S1rtsRAmgaAKD55UvKUqeg7CErE+gQkD3JihFhgwCg2z0i
+2hVEwDC6GZu2qtxsyx11Y5Q=
+=D73e
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch
new file mode 100644
index 000000000000..13ffb5f656d3
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-ia64.patch
@@ -0,0 +1,49 @@
+--- /dev/null	1969-12-31 16:00:00.000000000 -0800
++++ hw/xfree86/os-support/shared/ia64Pci.h	2007-08-03 12:56:38.000000000 -0700
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2004, Egbert Eich
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to
++ * deal in the Software without restriction, including without limitation the
++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
++ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ * Except as contained in this notice, the name of Egbert Eich shall not
++ * be used in advertising or otherwise to promote the sale, use or other deal-
++ *ings in this Software without prior written authorization from Egbert Eich.
++ *
++ */
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#ifndef _IA64_PCI_H
++# define _IA64_PCI_H
++
++#include "Pci.h"
++
++typedef enum {
++    NONE_CHIPSET,
++    I460GX_CHIPSET,
++    E8870_CHIPSET,
++    ZX1_CHIPSET,
++    ALTIX_CHIPSET
++} IA64Chipset;
++
++# ifdef OS_PROBE_PCI_CHIPSET
++extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
++# endif
++#endif
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.4-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
new file mode 100644
index 000000000000..c06a742153f7
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
@@ -0,0 +1,6 @@
+MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538
+RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538
+SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538
+MD5 a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 6179392
+RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 xorg-server-1.4.tar.bz2 6179392
+SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 xorg-server-1.4.tar.bz2 6179392
diff --git a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
new file mode 100644
index 000000000000..bfa5a9a0b282
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
@@ -0,0 +1,559 @@
+# 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.4-r2.ebuild,v 1.1 2007/10/01 10:31:56 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="7.0.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"
+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_amd
+	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_vermilion
+	video_cards_vesa
+	video_cards_vga
+	video_cards_via
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_xgi
+	video_cards_nvidia"
+#	video_cards_fglrx"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
+	3dfx
+	dri hal ipv6 minimal nptl sdl xprint"
+RDEPEND="hal? ( sys-apps/hal )
+	>=x11-libs/libXfont-1.3.1
+	>=x11-libs/xtrans-1.0.4
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXext-1.0.2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXmu-1.0.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/pixman-0.9.5
+	media-libs/freetype
+	>=media-libs/mesa-7.0.1
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-0.9
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.1
+	>=x11-apps/xauth-1.0.2
+	>=x11-apps/xinit-1.0.5
+	app-admin/eselect-opengl
+	>=x11-libs/libXaw-1.0.4
+	>=x11-libs/libXpm-3.5.7
+	>=x11-libs/libXxf86misc-1.0.1
+	>=x11-libs/libXxf86vm-1.0.1
+	dmx? ( >=x11-libs/libdmx-1.0.2
+			>=x11-libs/libXfixes-4.0.3 )
+	!minimal? ( >=x11-libs/libXtst-1.0.3
+		>=x11-libs/libXres-1.0.3 )
+	>=x11-libs/libxkbui-1.0.2
+	>=x11-libs/liblbxutil-1.0.1
+	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-7.0.2
+	>=x11-proto/xproto-7.0.10
+	>=x11-proto/xf86dgaproto-2.0.3
+	>=x11-proto/xf86miscproto-0.9.2
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.2
+	>=x11-proto/xf86bigfontproto-1.1.2
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/recordproto-1.13.2
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/scrnsaverproto-1.1.0
+	>=x11-proto/evieext-1.0.2
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1-r1
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.4.2.1
+	>=x11-proto/bigreqsproto-1.0.2
+	>=x11-proto/xcmiscproto-1.1.2
+	>=x11-proto/glproto-1.4.8
+	dmx? ( >=x11-proto/dmxproto-2.2.2 )
+	dri? ( >=x11-proto/xf86driproto-2.0.3
+		>=x11-libs/libdrm-2.3 )
+	xprint? ( >=x11-proto/printproto-1.0.3
+		>=x11-apps/mkfontdir-1.0.3
+		>=x11-apps/mkfontscale-1.0.3
+		>=x11-apps/xplsprinters-1.0.1 )"
+
+# 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.1 )
+		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
+		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.1 )
+		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 )
+		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.2.0 )
+		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 )
+		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 )
+		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.2.1 )
+		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
+		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.2 )
+		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_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
+		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_vermilion? ( >=x11-drivers/xf86-video-vermilion-1.0.0 )
+		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_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
+		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.19 )
+		!x11-drivers/ati-drivers
+	)"
+#		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
+LICENSE="${LICENSE} MIT"
+
+PATCHES="
+	${FILESDIR}/${PV}-ia64.patch
+	${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
+	${FILESDIR}/${PV}-fpic-libxf86config.patch
+	${FILESDIR}/${PV}-document-new-font-catalogs.patch
+	${FILESDIR}/${PV}-fix-dmx-build.patch
+	${FILESDIR}/${PV}-fix-dmx-link.patch
+	${FILESDIR}/${PV}-fix-xephyr-link.patch
+	${FILESDIR}/${PV}-fix-xprint-build.patch
+	${FILESDIR}/${PV}-fix-xprint-link.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)
+		$(use_enable hal config-dbus)
+		$(use_enable hal config-hal)
+		--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 || use dmx || use xprint; then
+			SNAPSHOT="yes"
+		fi
+	fi
+
+	if use hal; then
+		sed -i \
+			-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
+			"${S}"/config/Makefile.am \
+			|| die "failed to fix DBUS config directory"
+		SNAPSHOT="yes"
+	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!"
+
+	echo
+	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.3"
+	ewarn "or earlier, because the ABI changed. If you cannot start X because"
+	ewarn "of module version mismatch errors, this is your problem."
+	ebeep 5
+	epause 10
+}
+
+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*
+	exeinto /etc/X11/xinit/xinitrc.d
+	doexe ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	# Patch profile scripts
+	sed -e "s:/etc/init.*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."
+}