Drop xorg-server 1.5 series

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 10 insertions, 556 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 9fe9fc93e1ef..3876ef0638c1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.504 2010/04/16 22:14:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.505 2010/04/18 08:41:21 scarabeus Exp $
+
+  18 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.4-fix-kdrive-automake.patch, -xorg-server-1.5.3-r6.ebuild,
+  -files/1.4-fpic-libxf86config.patch:
+  Drop xorg-server 1.5 series
 
   16 Apr 2010; Pacho Ramos <pacho@gentoo.org> xorg-server-1.7.6.ebuild:
   amd64 stable, bug 308521
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 65c4e57e6963..14d2b924e5a1 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
-AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
 AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
@@ -12,22 +10,19 @@ AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
-DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
-DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
-EBUILD xorg-server-1.5.3-r6.ebuild 15607 RMD160 13afb38910b3e04ff352c363aea529f984066de9 SHA1 55d4538178c2d4a1d3775ac605b03a852e9813db SHA256 230f98c9cdcebd42f94f1364a1a0ae317de9772968bcd97229e1be2e08f1d4af
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
 EBUILD xorg-server-1.7.6.ebuild 7312 RMD160 948ec5f5599c0fc0440d2972b42ec5ded0cc41ce SHA1 8cf29fdad868e358f103b265ecacd69b2f197689 SHA256 9d589ce759ae74d6cfcf859f7d2446917ea67432db6536a72f61a878ea537d46
 EBUILD xorg-server-1.8.0.ebuild 8163 RMD160 256d04fae9d5a1f395479558d8ef53c0c5558299 SHA1 26c6e8befd90bf1f8a059914b03f00a0bad172f3 SHA256 a6b7a567f020a1feb343fdde0b9833c2e06b9d4079aa442bde9f0ac9c3f74530
-MISC ChangeLog 113200 RMD160 bd9eb97a64c1ad5bc2c2c12ab8c80a485b763979 SHA1 79884cc5fa98298db82c9a103b888e1055275d53 SHA256 3b660a38c0538fad5fd47280ccf29d643983e6e8ec59e393bbcb60a0dd9edfae
+MISC ChangeLog 113399 RMD160 2d71ef0c73073d92142c2d2f00e8905e19899256 SHA1 cd45fcc8d0784948eb6f21d19717efc4b7ca7f96 SHA256 0aa3ca14ed4f5d8869a8121268b44047fd8d70184cd43fe481b65caa41b74285
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvI4UcACgkQCaWpQKGI+9St/ACggDyuvUVTVOzLWYpqPxy09MYE
-3LMAniJ0k57B5hmI0uCAx1FW+h/+OS6y
-=3OSM
+iEYEARECAAYFAkvKxcwACgkQHB6c3gNBRYd6oQCeJbiOEpBAvc1E6xVHCs6W005G
+8BQAmgIunvmPd7+VBs+cY2i1/BOnSnY4
+=q53s
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch b/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
deleted file mode 100644
index cdc436ea0e84..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
-index 5803644..71d3403 100644
---- a/hw/kdrive/Makefile.am
-+++ b/hw/kdrive/Makefile.am
-@@ -1,6 +1,5 @@
- if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
--               smi via
-+VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 smi via
- endif
- 
- if BUILD_KDRIVEFBDEVLIB
diff --git a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
deleted file mode 100644
index c3b9ebdd6c4e..000000000000
--- a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 849ee8b..1b49d48 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
- 	DRI.c \
- 	Extensions.c
- 
--AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
- 
- EXTRA_DIST = \
- 	Configint.h \
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
deleted file mode 100644
index ebc2c867ea3f..000000000000
--- a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
+++ /dev/null
@@ -1,521 +0,0 @@
-# Copyright 1999-2010 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.5.3-r6.ebuild,v 1.19 2010/04/09 10:28:58 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-SRC_URI="${SRC_URI}
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-patches-08.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_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_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_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_xgi
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx tslib
-	hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( x11-libs/tslib x11-libs/libXCalibrate )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.3.3
-	>=x11-libs/xtrans-1.2.2
-	>=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.1.3
-	>=x11-libs/pixman-0.12
-	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.2.1
-	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.2
-	>=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.1
-		media-fonts/font-adobe-75dpi )
-	>=x11-libs/libxkbui-1.0.2
-	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
-	# xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.2
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	>=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.2
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.4.4
-	>=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-libs/libdrm-2.3 )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 )
-		input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate )
-		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
-		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.0  )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.0 )
-		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.85.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.0 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
-		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0  )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.1 )
-		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.1 )
-		video_cards_newport? ( x11-drivers/xf86-video-newport )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )
-		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.6.0 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.0 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.0 )
-		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.0 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.0 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.0.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.0 )
-		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-
-		!x11-drivers/xf86-video-impact
-		!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-cyrix
-		!x11-drivers/xf86-video-nsc
-	)"
-LICENSE="${LICENSE} MIT"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# Local customizations, unsuitable for upstream
-GENTOO_PATCHES=(
-	"${FILESDIR}/1.4-fpic-libxf86config.patch"
-	"${FILESDIR}/1.4-fix-kdrive-automake.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 xtrap)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable hal config-dbus)
-		$(use_enable hal config-hal)
-		--disable-dri2
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if ! use minimal; then
-		if built_with_use media-libs/mesa nptl; then
-			use nptl || die "${diemsg}"
-		else
-			use nptl && die "${diemsg}"
-		fi
-	fi
-
-	# (#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
-
-	# 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 ${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; 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.4.1"
-	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
-}
-
-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
-}
-
-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() {
-	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}
-}
-
-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."
-}