Clean out 1.3 RCs.
authorJoshua Baergen <joshuabaergen@gentoo.org>
Sat, 21 Apr 2007 05:59:19 +0000 (05:59 +0000)
committerJoshua Baergen <joshuabaergen@gentoo.org>
Sat, 21 Apr 2007 05:59:19 +0000 (05:59 +0000)
Package-Manager: portage-2.1.2.4

12 files changed:
x11-base/xorg-server/ChangeLog
x11-base/xorg-server/Manifest
x11-base/xorg-server/files/digest-xorg-server-1.2.99.901 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.99.902 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.99.903 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.99.903-r1 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.2.99.905 [deleted file]
x11-base/xorg-server/xorg-server-1.2.99.901.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.99.902.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.99.903-r1.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.99.903.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.2.99.905.ebuild [deleted file]

index 5a0bc84ef26aff02d5339da2851803680147f4fc..4a726100310c500f888318100b4551aaffe3f740 100644 (file)
@@ -1,6 +1,12 @@
 # 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.227 2007/04/21 05:57:18 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.228 2007/04/21 05:59:19 joshuabaergen Exp $
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-server-1.2.99.901.ebuild, -xorg-server-1.2.99.902.ebuild,
+  -xorg-server-1.2.99.903.ebuild, -xorg-server-1.2.99.903-r1.ebuild,
+  -xorg-server-1.2.99.905.ebuild:
+  Clean out 1.3 RCs.
 
 *xorg-server-1.3.0.0 (21 Apr 2007)
 
index 106e5218362ce8bc3ea76b6685a2c0b55a742557..f7e2933e98ed7135ba87ebcdbd654af2ec6b0867 100644 (file)
@@ -91,10 +91,6 @@ DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
 DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
 DIST xorg-server-1.2.99.0.tar.bz2 6170605 RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e SHA1 06bee10153da39f0f3cc89ca92bca766e996ebdf SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0
-DIST xorg-server-1.2.99.901.tar.bz2 5964551 RMD160 33e4342c2458093b9b4a4b9e5112ee124ee96f65 SHA1 779f72411fc4868b16d83385fa5fa38a7f9b8dd4 SHA256 f59fb358825af9f94679a64742b1bc516afa6ffff017c01a426110e82ed07ef8
-DIST xorg-server-1.2.99.902.tar.bz2 5963933 RMD160 9efe4199add8ab40562f6a9a74dc5e76189c8cb4 SHA1 0a68de99dc5fb849ca4b4e8ea9e24c9c26dbce06 SHA256 ed4d4aaee75300037974d20f6673aad4dcf98f09f3db6526c405244a45978741
-DIST xorg-server-1.2.99.903.tar.bz2 5968830 RMD160 8a01e5c0fb1322628f732fe826b1ee9c43147b4f SHA1 87bbd3f506493a2afeb1efe9b5bbc5caf913566b SHA256 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770
-DIST xorg-server-1.2.99.905.tar.bz2 5969487 RMD160 dfaa61b41a3443fce75296bf207dd6f7dde067af SHA1 413309d603b4ab2922d864d2f4e3b272ffafd61e SHA256 db980ce2d2e9d0ad43c888a509f601c8c1d2a802ad5aff9f69ad3acdea6e1453
 DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
 EBUILD xorg-server-1.1.1-r1.ebuild 17208 RMD160 e055625b08964f7f4a96e795127eb13a25a01f66 SHA1 84b7d4190468e97ef516a78cdc55fc8edc64d02a SHA256 c79f9f7bb2fb2077480415a2162e4fe7612d9eeccda90e2f4d51e7af8b6aa173
 MD5 886496f84d0490fcf63755399a46c378 xorg-server-1.1.1-r1.ebuild 17208
@@ -128,34 +124,14 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
-EBUILD xorg-server-1.2.99.901.ebuild 16310 RMD160 8c453c6c5b0bd4d06f03f331474927311ad39d9f SHA1 b4f6f45b0a47b08980e52c4bb1b825d6100e0ad5 SHA256 343e68fbb971c19034adaf61369ea30e6b0069dff37ce00aec6e75177c41c29d
-MD5 83b5b69eb34ea707fe5c15475aea5278 xorg-server-1.2.99.901.ebuild 16310
-RMD160 8c453c6c5b0bd4d06f03f331474927311ad39d9f xorg-server-1.2.99.901.ebuild 16310
-SHA256 343e68fbb971c19034adaf61369ea30e6b0069dff37ce00aec6e75177c41c29d xorg-server-1.2.99.901.ebuild 16310
-EBUILD xorg-server-1.2.99.902.ebuild 16314 RMD160 5938df0f38e042fb800a5f5d05b1aa89ec3383a4 SHA1 82cb620f290170e3b6d386c8099c60484326228d SHA256 5373db66fe43b61a16b83a3ccfcb42c04746b3d9812a80e6fe545b17bd2b2638
-MD5 45073dadffd53d02aa7a23bcf30359c3 xorg-server-1.2.99.902.ebuild 16314
-RMD160 5938df0f38e042fb800a5f5d05b1aa89ec3383a4 xorg-server-1.2.99.902.ebuild 16314
-SHA256 5373db66fe43b61a16b83a3ccfcb42c04746b3d9812a80e6fe545b17bd2b2638 xorg-server-1.2.99.902.ebuild 16314
-EBUILD xorg-server-1.2.99.903-r1.ebuild 16367 RMD160 e19f2b706570a7563bb52680f4ec62c5ed9031c2 SHA1 c5b4c8e35a3873ea64cfad640bad6fe381a5df6d SHA256 7ea1f1c74d62a184cc071ac534952f3eaa1462b137d70cf60b15e1ac492fe551
-MD5 756968292f33f0e901d249cd0ff1afe1 xorg-server-1.2.99.903-r1.ebuild 16367
-RMD160 e19f2b706570a7563bb52680f4ec62c5ed9031c2 xorg-server-1.2.99.903-r1.ebuild 16367
-SHA256 7ea1f1c74d62a184cc071ac534952f3eaa1462b137d70cf60b15e1ac492fe551 xorg-server-1.2.99.903-r1.ebuild 16367
-EBUILD xorg-server-1.2.99.903.ebuild 16314 RMD160 18d5c2a95c971f70f16fe9aa1cccdd0df6ee3f43 SHA1 b5ce67ebcb93d27aba821731fb8cb6e35b5426bc SHA256 7ce94d40656ecd854b4026dc3b964890a4e0b48b74cc41a0d3bb52ecd0b5303a
-MD5 6afab5e61d5bdacc1a93aa8d00a67e3a xorg-server-1.2.99.903.ebuild 16314
-RMD160 18d5c2a95c971f70f16fe9aa1cccdd0df6ee3f43 xorg-server-1.2.99.903.ebuild 16314
-SHA256 7ce94d40656ecd854b4026dc3b964890a4e0b48b74cc41a0d3bb52ecd0b5303a xorg-server-1.2.99.903.ebuild 16314
-EBUILD xorg-server-1.2.99.905.ebuild 16320 RMD160 1278014cb739ac9b67a013f0155c4f3729946233 SHA1 ca38aba0fcfa7f807d59beafacbee710f3c1a20d SHA256 40feefaaa7e4bb1937048d8435078a0cb18acd0e315b958175023be68cfc6d33
-MD5 6955b83e388af2eba5cfb0ed530bdbad xorg-server-1.2.99.905.ebuild 16320
-RMD160 1278014cb739ac9b67a013f0155c4f3729946233 xorg-server-1.2.99.905.ebuild 16320
-SHA256 40feefaaa7e4bb1937048d8435078a0cb18acd0e315b958175023be68cfc6d33 xorg-server-1.2.99.905.ebuild 16320
 EBUILD xorg-server-1.3.0.0.ebuild 16317 RMD160 5122af97f96534be47c9e8eead5648871970dac3 SHA1 5739d094baf6bb2a11188276f26ad8790e289027 SHA256 381af7cb98fd24950d3e274cfcced899ccd12d032862d6b8ab3a3e53ad489f47
 MD5 6712eaca79cdebb43a7aa6a9d625cf2f xorg-server-1.3.0.0.ebuild 16317
 RMD160 5122af97f96534be47c9e8eead5648871970dac3 xorg-server-1.3.0.0.ebuild 16317
 SHA256 381af7cb98fd24950d3e274cfcced899ccd12d032862d6b8ab3a3e53ad489f47 xorg-server-1.3.0.0.ebuild 16317
-MISC ChangeLog 48533 RMD160 05bacd7b9367a2111011b23707ce7e7c9616b328 SHA1 87b6c4902d46e6ef5151713404cc4111c49737fa SHA256 deb2fb2fa91b2e359db47ac6b5573add80a2920b649e7562d305955563542085
-MD5 17ef41a904aa56e075796e1cdbf7810e ChangeLog 48533
-RMD160 05bacd7b9367a2111011b23707ce7e7c9616b328 ChangeLog 48533
-SHA256 deb2fb2fa91b2e359db47ac6b5573add80a2920b649e7562d305955563542085 ChangeLog 48533
+MISC ChangeLog 48781 RMD160 225e507893157091df1fc93f4d0ca3b2380c245d SHA1 39b08cdc988508d90ddbd2b6c4fadcd1c57b0e05 SHA256 cdcc0cc9d0f5a2865317fcc5d0d71f25d9b8460b5f2356c37dbb2710e4c4874a
+MD5 58617a0ff0926e52cb6f5432f648303b ChangeLog 48781
+RMD160 225e507893157091df1fc93f4d0ca3b2380c245d ChangeLog 48781
+SHA256 cdcc0cc9d0f5a2865317fcc5d0d71f25d9b8460b5f2356c37dbb2710e4c4874a ChangeLog 48781
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -184,21 +160,6 @@ SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/di
 MD5 308173d8f7a2f60835b95ce92bd47e77 files/digest-xorg-server-1.2.99.0 515
 RMD160 e45f1b4e020b0cc57f5cb4ff3fd511c05e286540 files/digest-xorg-server-1.2.99.0 515
 SHA256 c1013b629f0a3186dc286d28768fdfd34261c14b07d08e52d4149a32875302c8 files/digest-xorg-server-1.2.99.0 515
-MD5 7c5b96e7f6b607bdb6af85dda063dd93 files/digest-xorg-server-1.2.99.901 521
-RMD160 48dddeade6123c84410725c783c5a4537b99b1c8 files/digest-xorg-server-1.2.99.901 521
-SHA256 ad0c66691e58b0deee80ac87975b90bb3f0049fcac8c6c4047588eeb8350fce1 files/digest-xorg-server-1.2.99.901 521
-MD5 d901c6db9aadff56c60ff02cf165c962 files/digest-xorg-server-1.2.99.902 521
-RMD160 9aaa787603173f96e5cb5113dac0acad77e01c60 files/digest-xorg-server-1.2.99.902 521
-SHA256 5bff59f66c67819a663624e8d607fd3c3418afdaeb703d732d06319c30505b2e files/digest-xorg-server-1.2.99.902 521
-MD5 0aa9b40fdbd644c3594432c963fd2299 files/digest-xorg-server-1.2.99.903 521
-RMD160 2d3c976d28bc6d7a402f83a3cdc3567ff643e5de files/digest-xorg-server-1.2.99.903 521
-SHA256 933d9039c8459a8e222463c506f06e4028b1c2c8d26d03e5c4a42cf474a1c5b4 files/digest-xorg-server-1.2.99.903 521
-MD5 0aa9b40fdbd644c3594432c963fd2299 files/digest-xorg-server-1.2.99.903-r1 521
-RMD160 2d3c976d28bc6d7a402f83a3cdc3567ff643e5de files/digest-xorg-server-1.2.99.903-r1 521
-SHA256 933d9039c8459a8e222463c506f06e4028b1c2c8d26d03e5c4a42cf474a1c5b4 files/digest-xorg-server-1.2.99.903-r1 521
-MD5 459250946c81159127847e3ce7ee2b04 files/digest-xorg-server-1.2.99.905 521
-RMD160 ee1ae89d551d77393ec960a754a9b149c163a210 files/digest-xorg-server-1.2.99.905 521
-SHA256 3280e53598c4ac8103cc222c699421a385e7a4234526c30af1e5e84ab93d7d46 files/digest-xorg-server-1.2.99.905 521
 MD5 f5088a38f31782713a97f0cf19bfbbd1 files/digest-xorg-server-1.3.0.0 512
 RMD160 70dafff2a513850c2631793f877a2ffe294758c6 files/digest-xorg-server-1.3.0.0 512
 SHA256 ae8d04a5e64f7aedd5cc910085a1db5ce1638012a3bfedeab142ce99b0d3968a files/digest-xorg-server-1.3.0.0 512
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.901 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.901
deleted file mode 100644 (file)
index d238411..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 7fa14761413ffaf36c0bf591cf419709 xorg-server-1.2.99.901.tar.bz2 5964551
-RMD160 33e4342c2458093b9b4a4b9e5112ee124ee96f65 xorg-server-1.2.99.901.tar.bz2 5964551
-SHA256 f59fb358825af9f94679a64742b1bc516afa6ffff017c01a426110e82ed07ef8 xorg-server-1.2.99.901.tar.bz2 5964551
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.902 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.902
deleted file mode 100644 (file)
index 4371cc7..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 e3013c42e2a450024983c78f5b0b4474 xorg-server-1.2.99.902.tar.bz2 5963933
-RMD160 9efe4199add8ab40562f6a9a74dc5e76189c8cb4 xorg-server-1.2.99.902.tar.bz2 5963933
-SHA256 ed4d4aaee75300037974d20f6673aad4dcf98f09f3db6526c405244a45978741 xorg-server-1.2.99.902.tar.bz2 5963933
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.903 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.903
deleted file mode 100644 (file)
index a1d6040..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 b7c61148bf5827f6a220696381bfba15 xorg-server-1.2.99.903.tar.bz2 5968830
-RMD160 8a01e5c0fb1322628f732fe826b1ee9c43147b4f xorg-server-1.2.99.903.tar.bz2 5968830
-SHA256 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770 xorg-server-1.2.99.903.tar.bz2 5968830
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.903-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.903-r1
deleted file mode 100644 (file)
index a1d6040..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 b7c61148bf5827f6a220696381bfba15 xorg-server-1.2.99.903.tar.bz2 5968830
-RMD160 8a01e5c0fb1322628f732fe826b1ee9c43147b4f xorg-server-1.2.99.903.tar.bz2 5968830
-SHA256 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770 xorg-server-1.2.99.903.tar.bz2 5968830
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.905 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.905
deleted file mode 100644 (file)
index 9d6cd5e..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 0c755fb74191ba1bca47657be8791bd2 xorg-server-1.2.99.905.tar.bz2 5969487
-RMD160 dfaa61b41a3443fce75296bf207dd6f7dde067af xorg-server-1.2.99.905.tar.bz2 5969487
-SHA256 db980ce2d2e9d0ad43c888a509f601c8c1d2a802ad5aff9f69ad3acdea6e1453 xorg-server-1.2.99.905.tar.bz2 5969487
diff --git a/x11-base/xorg-server/xorg-server-1.2.99.901.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.901.ebuild
deleted file mode 100644 (file)
index b56d5f6..0000000
+++ /dev/null
@@ -1,526 +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.99.901.ebuild,v 1.1 2007/03/10 00:39:54 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-1.2
-       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}/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.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.902.ebuild
deleted file mode 100644 (file)
index ea128df..0000000
+++ /dev/null
@@ -1,526 +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.99.902.ebuild,v 1.1 2007/03/20 02:14:50 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-1.2
-       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}/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.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.903-r1.ebuild
deleted file mode 100644 (file)
index cfca5f4..0000000
+++ /dev/null
@@ -1,528 +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.99.903-r1.ebuild,v 1.1 2007/04/05 07:00: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-1.2
-       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}/xorg-xserver-1.2.0-xcmisc.diff"
-
-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.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.903.ebuild
deleted file mode 100644 (file)
index cb7c809..0000000
+++ /dev/null
@@ -1,526 +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.99.903.ebuild,v 1.1 2007/03/28 00:24:50 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-1.2
-       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}/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.99.905.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.905.ebuild
deleted file mode 100644 (file)
index c05e1a4..0000000
+++ /dev/null
@@ -1,526 +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.99.905.ebuild,v 1.1 2007/04/06 18:43:00 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-1.2
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       >=x11-proto/damageproto-1.1
-       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}/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."
-}