bump xorg-server to 1.6.3.901

Signed-off-by: Zhang Le <r0bertz@gentoo.org>

3 files changed, 471 insertions, 0 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 11b2864..13df9f9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -44,6 +44,7 @@ AUX xorg-server-1.5.3-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf9
 AUX xorg-server-1.6.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
 AUX xorg-server-1.6.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
 AUX xorg-server-1.6.3-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
+AUX xorg-server-1.6.3.901-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
 AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab8d8e1a06 SHA1 a39df02932f9d24693e79bbcbb80e7e6a5c74fa0 SHA256 a19a28c5f4930348e7e4ed471d3d0e53f9d936e7a4c756281ada480b63ecc039
 AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
 AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
@@ -56,12 +57,14 @@ DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea449981002
 DIST xorg-server-1.6.0.tar.bz2 4655422 RMD160 35e473e3b0d2f3c3101bc7843dd57f0e1fce11d8 SHA1 9baf703a0dac91cb84c02caea18268d6afa78662 SHA256 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
 DIST xorg-server-1.6.2-gentoo-patches-03.tar.bz2 9299 RMD160 914123bc25ce08eff6f4a727f291960a5a546af8 SHA1 0d63288ea1dd7f795fab3f74faf26f62f24c8dac SHA256 4dc3305f65a705c215ec314bc26f3baf6bde861eb9beff86a07dc98c9653600c
 DIST xorg-server-1.6.2.tar.bz2 4647067 RMD160 37af2d733cdc7155de13cfdb21cc6367135bb440 SHA1 7eb0ae82762eecf5be031d63a77f0c1281569414 SHA256 893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
+DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
 DIST xorg-server-1.6.3.tar.bz2 4651487 RMD160 5b9ddfeb9fb7082ef600e368ada8abbb006fe418 SHA1 1f28e8723e110e5c1a1adf3bc89325a81a526184 SHA256 7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
 EBUILD xorg-server-1.4.0.90-r3.ebuild 19571 RMD160 2a18b5ff8b87141e0a6f06e3589d71e0a1f934dd SHA1 6fd1e7f78a2faefbc13f1ad5c3a8f77d121a458b SHA256 4f3375321e37883fa765105cbb7056f90e6d2d6e74d4ab06072a31d635618781
 EBUILD xorg-server-1.5.2.ebuild 16624 RMD160 3d8138427c0e2d74f8ca7bddda1450a2e43624af SHA1 169ad9cb089f72239d0379292a2e4b509b320ccf SHA256 de7400da67081ca41edd3bc76d3bef52bf585d63a52487ab86ea8e572cc35f85
 EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257
 EBUILD xorg-server-1.6.0.ebuild 13969 RMD160 a04a13060589a65202bad1c16402976ec17718af SHA1 22e92b969602857bc93257c4264ed6876fa699ed SHA256 92ca658906114d8627d22bcda284723cd9ba6cfafffd0dc2af457adcb19e0f83
 EBUILD xorg-server-1.6.2-r1.ebuild 14290 RMD160 b57a099f50ca3f3309fb733433f7f5ca2ca7d934 SHA1 09690993f683b488e3f220572ccd9de875e52139 SHA256 da513429e9eedf29f546eb8951fc0aa20bacdb66812ee0b0969b03d6b03102e5
+EBUILD xorg-server-1.6.3.901.ebuild 12819 RMD160 dedd385ee407a1c53c44de1ac0b06da1d238b6b6 SHA1 dadfda299c55730c2f57fc4827e0cdf696879ff4 SHA256 3f11e5a3789c2f40500c1b28f75aa7dc8bcdad9516009c980b49c668ba0a5e5e
 EBUILD xorg-server-1.6.3.ebuild 12880 RMD160 c9b1f4008f1d9b55705e5b3d154b96b33d45fd81 SHA1 89cc29b24146da322697403769e115e811796080 SHA256 58be6b8f78af5020567ea91ae5aab2301e9a72d857ae5522c46838d3fc962efe
 EBUILD xorg-server-9999.ebuild 13974 RMD160 5df9e7a97e2becf05a56756b21e2945416ec04ba SHA1 4ae167f622911208539bb80330d287ffdce259a6 SHA256 bd73081e164fe8aae6b2d589b04d345d999ec098a7be4eec09b296b0140ed26b
 MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7
diff --git a/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch
new file mode 100644
index 0000000..4351f28
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch
@@ -0,0 +1,53 @@
+diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h
+index 1528cc1..6be12b9 100644
+--- a/hw/xfree86/dri/sarea.h
++++ b/hw/xfree86/dri/sarea.h
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 			0x2000
++#elif defined(__mips__)
++#define SAREA_MAX			0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000		/* 64kB */
+ #else
+diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
+index 688106a..1552860 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL;
+ _X_EXPORT Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ 	int fd;
+ 	unsigned int ioBase_phys;
++	extern unsigned int IOPortBase;
+ #endif
+ 
+ 	if (ExtendedEnabled)
+@@ -532,7 +533,22 @@ xf86EnableIO(void)
+ #endif
+ 	}
+ 	close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
++#elif defined(__mips__)
++	fd = open("/dev/mem", O_RDWR);
++	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++			PROT_READ | PROT_WRITE, MAP_SHARED, fd,
++			0x1fd00000);
++	if (IOPortBase == MAP_FAILED) {
++		xf86Msg(X_WARNING,
++				"xf86EnableIOPorts: Failed to map iobase (%s)\n",
++				strerror(errno));
++		return FALSE;
++	}
++	close(fd);
++	xf86Msg(X_WARNING,
++	       "xf86EnableIOPorts: map iobase (%x)\n",
++	        IOPortBase);
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
+         if (ioperm(0, 1024, 1) || iopl(3)) {
+                 if (errno == ENODEV)
+                         ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
new file mode 100644
index 0000000..37e434c
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2009 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.6.3.901.ebuild,v 1.1 2009/08/26 13:04:21 remi Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+# keithp put this one in archive/ instead of releases/ for unknown reasons
+BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
+SRC_URI="${SRC_URI}
+	${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
+#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
+
+OPENGL_DIR="xorg-x11"
+
+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_citron
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_fpit
+	input_devices_hyperpen
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_mouse
+	input_devices_mutouch
+	input_devices_penmount
+	input_devices_tslib
+	input_devices_virtualbox
+	input_devices_vmmouse
+	input_devices_void
+
+	input_devices_synaptics
+	input_devices_wacom"
+IUSE_VIDEO_CARDS="
+	video_cards_apm
+	video_cards_ark
+	video_cards_ast
+	video_cards_chips
+	video_cards_cirrus
+	video_cards_dummy
+	video_cards_epson
+	video_cards_fbdev
+	video_cards_geode
+	video_cards_glint
+	video_cards_i128
+	video_cards_i740
+	video_cards_intel
+	video_cards_impact
+	video_cards_imstt
+	video_cards_mach64
+	video_cards_mga
+	video_cards_neomagic
+	video_cards_newport
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	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_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_xgi
+	video_cards_fglrx
+	video_cards_nvidia"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
+	tslib hal ipv6 minimal nptl sdl"
+RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	dev-libs/openssl
+	>=x11-libs/libXfont-1.4.0
+	>=x11-libs/xtrans-1.2.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXext-1.0.4
+	>=x11-libs/libX11-1.1.5
+	>=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.2.1
+	>=x11-libs/pixman-0.14.0
+	media-libs/freetype
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	>=x11-apps/xinit-1.0.8-r3
+	>=app-admin/eselect-opengl-1.0.7
+	>=x11-libs/libXaw-1.0.5
+	>=x11-libs/libXpm-3.5.7
+	>=x11-libs/libpciaccess-0.10.3
+	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
+		>=media-libs/mesa-7.3_rc1[nptl=]
+	)
+	>=x11-libs/libxkbui-1.0.2
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent
+	# Xaw is dmx-dependent
+	# Xpm is dmx-dependent, pulls in Xt
+	# xkbcomp is launched at startup but not checked by ./configure
+DEPEND="${RDEPEND}
+	!net-dialup/dtrace
+	sys-devel/flex
+	>=x11-proto/randrproto-1.2.99.4
+	>=x11-proto/renderproto-0.9.3
+	>=x11-proto/fixesproto-4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/xextproto-7.0.4
+	>=x11-proto/xproto-7.0.14
+	>=x11-proto/xf86dgaproto-2.0.3
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.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/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1.2
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.5.0
+	>=x11-proto/bigreqsproto-1.0.2
+	>=x11-proto/xcmiscproto-1.1.2
+	>=x11-proto/glproto-1.4.9
+	dmx? ( >=x11-proto/dmxproto-2.2.2 )
+	!minimal? (
+		>=x11-proto/xf86driproto-2.0.4
+		>=x11-proto/dri2proto-2.1
+		>=x11-libs/libdrm-2.3
+	)"
+
+# Drivers
+PDEPEND="
+	xorg? (
+		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
+		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
+		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
+		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
+		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
+		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
+		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
+		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
+		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
+		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
+		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
+		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
+		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
+		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
+		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
+		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
+		input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
+		input_devices_wacom? ( x11-drivers/linuxwacom )
+
+		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.1 )
+		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
+		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
+		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
+		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
+		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
+		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
+		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.11.0  )
+		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
+		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
+		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
+		video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
+		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
+		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.2 )
+		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
+		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
+		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
+		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
+		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
+		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
+		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
+		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
+		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
+		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
+		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
+		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
+		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.1 )
+		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
+		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
+		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
+		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
+		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
+		video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
+		video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
+		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
+		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
+		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
+
+		!x11-drivers/xf86-video-impact
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-vermilion
+
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-vga
+	)"
+LICENSE="${LICENSE} MIT"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# Local customizations, unsuitable for upstream
+GENTOO_PATCHES=(
+	"${FILESDIR}/${P}-loongson.patch"
+	"${FILESDIR}/1.4-fpic-libxf86config.patch"
+	)
+
+# These have been sent upstream
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#	)
+
+PATCHES=(
+	"${GENTOO_PATCHES[@]}"
+	"${UPSTREAMED_PATCHES[@]}"
+	)
+
+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
+
+	# 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 tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xorg)
+		$(use_enable nptl glx-tls)
+		$(use_enable hal config-hal)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--without-dtrace
+		${conf_opts}"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+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.5"
+	ewarn "or earlier, because the ABI changed. If you cannot start X because"
+	ewarn "of module version mismatch errors, this is your problem."
+
+	echo
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
+	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
+
+	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
+}
+
+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/lib{glx,dri}*; 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() {
+	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 ${OLD_IMPLEM}
+}
+
+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."
+}