Pull versions that will never go stable or are stale.
authorDonnie Berkholz <dberkholz@gentoo.org>
Wed, 2 May 2007 08:22:22 +0000 (08:22 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Wed, 2 May 2007 08:22:22 +0000 (08:22 +0000)
Package-Manager: portage-2.1.2.5

x11-base/xorg-server/ChangeLog
x11-base/xorg-server/Manifest
x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.0 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.0-r1 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.0-r2 [deleted file]
x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.0-r1.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.0-r2.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.0.ebuild [deleted file]

index 21cac5750bf16bdb56647b28d341b8cea6fae052..2a297f2df00e153bf04466c6ab7c8a912ba5de92 100644 (file)
@@ -1,6 +1,11 @@
 # 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.235 2007/05/01 10:03:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.236 2007/05/02 08:22:22 dberkholz Exp $
+
+  02 May 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.1.1-r4.ebuild, -xorg-server-1.2.0.ebuild,
+  -xorg-server-1.2.0-r1.ebuild, -xorg-server-1.2.0-r2.ebuild:
+  Pull versions that will never go stable or are stale.
 
   01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild:
   Allow also nvidia-drivers-1.0.9631-r1 which appears to be working and
index eb6772193a556b4fe1fdb9873207ba82fd1ca86e..0a7314ab8e9d605acdde86fc6e4bdb09b7d95cc0 100644 (file)
@@ -96,30 +96,14 @@ EBUILD xorg-server-1.1.1-r1.ebuild 17208 RMD160 e055625b08964f7f4a96e795127eb13a
 MD5 886496f84d0490fcf63755399a46c378 xorg-server-1.1.1-r1.ebuild 17208
 RMD160 e055625b08964f7f4a96e795127eb13a25a01f66 xorg-server-1.1.1-r1.ebuild 17208
 SHA256 c79f9f7bb2fb2077480415a2162e4fe7612d9eeccda90e2f4d51e7af8b6aa173 xorg-server-1.1.1-r1.ebuild 17208
-EBUILD xorg-server-1.1.1-r4.ebuild 17412 RMD160 19773e74e27b3e3476bfae616872d38545eb0c6f SHA1 92ecf01349f4eb2bca5ccc1b2349934fa9a6fe72 SHA256 e0b28db46a8a86dbcda5aca5e82ec5a208317fcef9987d31a421b3a1c975e8d2
-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.1.1-r5.ebuild 17459 RMD160 58653675b5bde4c2e7e0d9d286b59e264d36b969 SHA1 65658761925125353f46ca619f03e791972aeeb0 SHA256 a4b83b6c2426edcaf7a90f2001d3212fa50b7868677f33e8ff01b397374eab19
 MD5 a362c562bb73022b7935b693b4364e11 xorg-server-1.1.1-r5.ebuild 17459
 RMD160 58653675b5bde4c2e7e0d9d286b59e264d36b969 xorg-server-1.1.1-r5.ebuild 17459
 SHA256 a4b83b6c2426edcaf7a90f2001d3212fa50b7868677f33e8ff01b397374eab19 xorg-server-1.1.1-r5.ebuild 17459
-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-r2.ebuild 16446 RMD160 a25c7be1dd1c1286d4b906cd6d443dbd74997881 SHA1 033d001978bda4692037cc7789b36007097b60c9 SHA256 f411595dc1d845d0e0f3717ce45abe4b2dd2c256857fdafe4e68e1e2f802a6cb
-MD5 0c35a649e87a68e5d5be33e6a1f0366d xorg-server-1.2.0-r2.ebuild 16446
-RMD160 a25c7be1dd1c1286d4b906cd6d443dbd74997881 xorg-server-1.2.0-r2.ebuild 16446
-SHA256 f411595dc1d845d0e0f3717ce45abe4b2dd2c256857fdafe4e68e1e2f802a6cb xorg-server-1.2.0-r2.ebuild 16446
 EBUILD xorg-server-1.2.0-r3.ebuild 16479 RMD160 f34661b793265813692c525ae2838eb1f2acd449 SHA1 e25616079cbb0b619a793e0b7d9182615b5ed5c3 SHA256 ce510bcc20047ee35bac1c4efdf1c9736105ed914eb30e95d047b761e233e5cd
 MD5 338b8b81bb95fcc7328db750c7255016 xorg-server-1.2.0-r3.ebuild 16479
 RMD160 f34661b793265813692c525ae2838eb1f2acd449 xorg-server-1.2.0-r3.ebuild 16479
 SHA256 ce510bcc20047ee35bac1c4efdf1c9736105ed914eb30e95d047b761e233e5cd xorg-server-1.2.0-r3.ebuild 16479
-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
-SHA256 3edddd3839e46909ae9f0cc843f6a13197b78786f0ae8e7fe1082df5b272d91e xorg-server-1.2.0.ebuild 16451
 EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 SHA1 8cc96925d7cd80784585c24d14f307f49d540b9d SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
@@ -128,10 +112,10 @@ EBUILD xorg-server-1.3.0.0.ebuild 16292 RMD160 e5bb500ad71dfea36ad2e169c1ee701a5
 MD5 c97b6a55794d1b3086e44d053667fcba xorg-server-1.3.0.0.ebuild 16292
 RMD160 e5bb500ad71dfea36ad2e169c1ee701a58d9f5a9 xorg-server-1.3.0.0.ebuild 16292
 SHA256 50b0aac0417296b79e0c6ab43495d36d8d8cf9504ecedab3903d32fc27146556 xorg-server-1.3.0.0.ebuild 16292
-MISC ChangeLog 49965 RMD160 3730ecb1e549eb35057ce384dfd96d0bfd183dd1 SHA1 74de37208a13bb6f562eace1c6d2d85000288306 SHA256 1381e50376a7176b6fefb4e573b568c7c291183e6337cd45762537ee84f8277a
-MD5 5978a8e01743e5c8f97cefb43a6c01be ChangeLog 49965
-RMD160 3730ecb1e549eb35057ce384dfd96d0bfd183dd1 ChangeLog 49965
-SHA256 1381e50376a7176b6fefb4e573b568c7c291183e6337cd45762537ee84f8277a ChangeLog 49965
+MISC ChangeLog 50203 RMD160 d5a7fc86dc3be8c9ad636c2ba04b932ee1b05ebb SHA1 fbfd41e12d876a424c3506181e960454762760ec SHA256 9f43670244c5bbc1e9f05579eff32f428bea0fcf20c179930604c5056aa1ba0d
+MD5 a44191d8e4850ec7f8be090bb06397b0 ChangeLog 50203
+RMD160 d5a7fc86dc3be8c9ad636c2ba04b932ee1b05ebb ChangeLog 50203
+SHA256 9f43670244c5bbc1e9f05579eff32f428bea0fcf20c179930604c5056aa1ba0d ChangeLog 50203
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -139,21 +123,9 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r4 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r4 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r4 506
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r5 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r5 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r5 506
-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 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0-r2 506
-RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0-r2 506
-SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0-r2 506
 MD5 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0-r3 506
 RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0-r3 506
 SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0-r3 506
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4
deleted file mode 100644 (file)
index 1330edc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.0 b/x11-base/xorg-server/files/digest-xorg-server-1.2.0
deleted file mode 100644 (file)
index a78fe15..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-xorg-server-1.2.0-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r1
deleted file mode 100644 (file)
index a78fe15..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-xorg-server-1.2.0-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r2
deleted file mode 100644 (file)
index a78fe15..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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.1.1-r4.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild
deleted file mode 100644 (file)
index 4bde491..0000000
+++ /dev/null
@@ -1,556 +0,0 @@
-# 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.1.1-r4.ebuild,v 1.11 2007/02/11 10:54:48 vapier 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.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"
-# 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
-       aiglx
-       dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-       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-r2
-       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-r1
-       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 )
-       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"
-
-pkg_setup() {
-       use minimal || ensure_a_server_is_building
-
-       PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-               ${FILESDIR}/${P}-install-libxf86config-headers.patch
-               ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-               ${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-               ${FILESDIR}/xorg-conf-example.patch
-               ${FILESDIR}/${PV}-fix_acpi_tokenize.patch
-               ${FILESDIR}/${PV}-fixdualhead.patch
-               ${FILESDIR}/${PV}-sparc-includes.patch
-               ${FILESDIR}/${PV}-dbe-render.diff"
-
-       # Patches required for compiz to work with AIGLX,
-       # but they slow EXA down (bug #147841).
-       if use aiglx; then
-               einfo "AIGLX patches will be applied."
-               ewarn "These patches are known to cause problems with EXA enabled."
-               PATCHES="${FILESDIR}/01-no-move-damage.patch
-                       ${FILESDIR}/02-dont-backfill-bg-none.patch
-                       ${FILESDIR}/03-tfp-damage.patch
-                       ${FILESDIR}/04-mesa-copy-sub-buffer.patch
-                       ${FILESDIR}/05-offscreen-pixmaps.patch
-                       ${FILESDIR}/06-aiglx-happy-vt-switch.patch
-                       ${FILESDIR}/${PV}-fix_big_endian_glx.patch
-                       ${PATCHES}"
-       fi
-
-       # 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 xorgcfg)
-               $(use_enable !minimal install-libxf86config)
-               $(use_enable dri)
-               $(use_enable xorg)
-               $(use_enable xprint)
-               $(use_enable nptl glx-tls)
-               --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 || use xprint; 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}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # 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.sh
-       # 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."
-}
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
deleted file mode 100644 (file)
index 0b9a64a..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.2.0-r2.ebuild b/x11-base/xorg-server/xorg-server-1.2.0-r2.ebuild
deleted file mode 100644 (file)
index fdd6be6..0000000
+++ /dev/null
@@ -1,530 +0,0 @@
-# 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-r2.ebuild,v 1.1 2007/03/17 00:04:21 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
-       ${FILESDIR}/${PV}-client-leak.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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.2.0.ebuild b/x11-base/xorg-server/xorg-server-1.2.0.ebuild
deleted file mode 100644 (file)
index 47a4ce4..0000000
+++ /dev/null
@@ -1,530 +0,0 @@
-# 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.ebuild,v 1.1 2007/01/24 06:18:19 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-       mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-       http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-# 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"
-
-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}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # 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.sh
-       # 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."
-}