Bump for 7.1 final. Includes various crash fixes, etc.

(Portage version: 2.1_rc1-r4)
 (Unsigned Manifest commit)

3 files changed, 31 insertions, 685 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d559d833de57..9604a34e3e82 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,79 +1,79 @@
-AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 size 563
+AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1
 MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563
 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563
 SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 files/1.0.2-Xprint-xprintdir.patch 563
-AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 size 2021
+AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620
 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 SHA1 1487c444de9f6348e49d150a1cdb0517569030ab SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 size 3420
+AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 SHA1 1487c444de9f6348e49d150a1cdb0517569030ab SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74
 MD5 bf743bd4e1b1c3a6b3d3122f48f8f6a7 files/1.0.2-try-to-fix-xorgcfg.patch 3420
 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 files/1.0.2-try-to-fix-xorgcfg.patch 3420
 SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 SHA1 387df8c7669b525fc7b041ce7574324680dbce48 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 size 447
+AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 SHA1 387df8c7669b525fc7b041ce7574324680dbce48 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955
 MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447
 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447
 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447
-AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b size 819
+AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b
 MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b files/CVE-2006-1526-xrender-mitri.patch 819
-AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 size 414
+AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-AUX xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 SHA1 08db11a8a841415496f5ff8ef8a21b1425d392cd SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b size 663
+AUX xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 SHA1 08db11a8a841415496f5ff8ef8a21b1425d392cd SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b
 MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
 SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-AUX xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 SHA1 49def422c5b5189dde7581ac295aac1f510bc14d SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 size 766
+AUX xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 SHA1 49def422c5b5189dde7581ac295aac1f510bc14d SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1
 MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
 SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-AUX xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e size 2388
+AUX xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e
 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388
 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388
 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388
-AUX xorg-server-1.0.2-Xprt-build.patch 7747 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 SHA1 2da85693520d1f787d4ee9e3bd52f14261adee9b SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 size 7747
+AUX xorg-server-1.0.2-Xprt-build.patch 7747 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 SHA1 2da85693520d1f787d4ee9e3bd52f14261adee9b SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73
 MD5 fb7fc524e87b10dd3cb506c3398741cf files/xorg-server-1.0.2-Xprt-build.patch 7747
 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 files/xorg-server-1.0.2-Xprt-build.patch 7747
 SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 files/xorg-server-1.0.2-Xprt-build.patch 7747
-AUX xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f SHA1 957e201d1095ef4cc4ec1c87736897d37c0103d7 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b size 1062
+AUX xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f SHA1 957e201d1095ef4cc4ec1c87736897d37c0103d7 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b
 MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e991092f89a017 SHA1 7d2a4eb212cc770cc22a496df2696a0bca1f7774 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 size 417
+AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e991092f89a017 SHA1 7d2a4eb212cc770cc22a496df2696a0bca1f7774 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905
 MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
 RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
-AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 size 598
+AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
-DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 size 6388
-DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 size 2913009
-DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd size 3062363
-DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba size 6006486
-DIST xorg-server-1.0.99.903.tar.bz2 6321704 RMD160 09b2b10b979349283e989a7326f0c16e6302e122 SHA256 d64f44e9aa0807c5e30c5c0df65dfdb73139bb82e82958bdaf37aeeb11ed7087 size 6321704
-EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa SHA1 6c17c4717364f28407e8163d232e1fe61c6d5b7b SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be size 6052
+DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67
+DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
+DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
+DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
+DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
+EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa SHA1 6c17c4717364f28407e8163d232e1fe61c6d5b7b SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be
 MD5 27e2b115cca585af5c363bcbfed14e61 xorg-server-1.0.2-r4.ebuild 6052
 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa xorg-server-1.0.2-r4.ebuild 6052
 SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be xorg-server-1.0.2-r4.ebuild 6052
-EBUILD xorg-server-1.0.99.903.ebuild 22538 RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b SHA1 dcb1d3422c88ad49e87e6de371b69ee84e6f8d6f SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab size 22538
-MD5 265ce9a3299a70ae20dd71f7e94c2a2e xorg-server-1.0.99.903.ebuild 22538
-RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b xorg-server-1.0.99.903.ebuild 22538
-SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab xorg-server-1.0.99.903.ebuild 22538
-MISC ChangeLog 25866 RMD160 0cd7e2889966bce842bab163c8529a32f95ae9df SHA1 6d44261f5aa2cf7b650555ccb926949a50bff320 SHA256 ee2e6b49e95de422b435d39d70dd72eb9537f4fbf1d2a0ebd70360a42b2b6edc size 25866
-MD5 24cc01a7dae5e52a828c3f509e681842 ChangeLog 25866
-RMD160 0cd7e2889966bce842bab163c8529a32f95ae9df ChangeLog 25866
-SHA256 ee2e6b49e95de422b435d39d70dd72eb9537f4fbf1d2a0ebd70360a42b2b6edc ChangeLog 25866
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
+EBUILD xorg-server-1.1.0.ebuild 22537 RMD160 f1fa19634cde739eb15887dcf88c461cfb3fe49d SHA1 4999fc05e9dee7ec4f2af824e3f056091181dd0a SHA256 498680f2a1275a883b20edfb038e526fab0f8d0260ae88639590eef92b607795
+MD5 964ac1839c22459198936696ad919513 xorg-server-1.1.0.ebuild 22537
+RMD160 f1fa19634cde739eb15887dcf88c461cfb3fe49d xorg-server-1.1.0.ebuild 22537
+SHA256 498680f2a1275a883b20edfb038e526fab0f8d0260ae88639590eef92b607795 xorg-server-1.1.0.ebuild 22537
+MISC ChangeLog 26081 RMD160 3c4894bd2df090601732ede9cbfeade3f0cb6456 SHA1 51366f3f5e37ea92b946387fb6bf549a66512b94 SHA256 03a609ddbf916c02e9d2e0b2b8d0214fb2024ccade356469738960e83b30c83e
+MD5 a47443ad6e91fbabdf4783d08524724a ChangeLog 26081
+RMD160 3c4894bd2df090601732ede9cbfeade3f0cb6456 ChangeLog 26081
+SHA256 03a609ddbf916c02e9d2e0b2b8d0214fb2024ccade356469738960e83b30c83e ChangeLog 26081
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r4 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r4 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r4 771
-MD5 c901890701ce4f219698fcb0f171c57a files/digest-xorg-server-1.0.99.903 515
-RMD160 303286144d0f982830d8d88ee58384a1b1712efa files/digest-xorg-server-1.0.99.903 515
-SHA256 86eacae3d73c2c00a4f060fb6592c3b7eee469a96d17274c549fd416e11152ae files/digest-xorg-server-1.0.99.903 515
+MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0 500
+RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0 500
+SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0 500
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.903 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.903
deleted file mode 100644
index 335bd203637d..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.903
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 18a1b0077839bfd5052a666c0de63f6d xorg-server-1.0.99.903.tar.bz2 6321704
-RMD160 09b2b10b979349283e989a7326f0c16e6302e122 xorg-server-1.0.99.903.tar.bz2 6321704
-SHA256 d64f44e9aa0807c5e30c5c0df65dfdb73139bb82e82958bdaf37aeeb11ed7087 xorg-server-1.0.99.903.tar.bz2 6321704
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild
deleted file mode 100644
index 27e18f5fc341..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild
+++ /dev/null
@@ -1,648 +0,0 @@
-# Copyright 1999-2006 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.0.99.903.ebuild,v 1.4 2006/05/14 22:16:51 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${PN}-1.0.2-xprint-init.patch
-	${FILESDIR}/1.0.99.901-Xprint-xprintdir.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/snapshots/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_magictouch
-	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_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_nvidia
-	video_cards_fglrx"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	3dfx
-	dmx dri ipv6 kdrive minimal nptl sdl xorg xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libdmx
-		x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.6
-	!minimal? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale )"
-
-# Drivers
-###############################################################################
-###############################################################################
-##                                                                           ##
-##   REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES   ##
-##                                                                           ##
-###############################################################################
-###############################################################################
-PDEPEND="
-	|| (
-			(
-				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_magictouch? ( x11-drivers/xf86-input-magictouch )
-				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-misc/linuxwacom )
-			)
-			(
-				>=x11-drivers/xf86-input-acecad-1.1.0
-				>=x11-drivers/xf86-input-calcomp-1.1.0
-				>=x11-drivers/xf86-input-citron-2.2.0
-				>=x11-drivers/xf86-input-digitaledge-1.1.0
-				>=x11-drivers/xf86-input-dmc-1.1.0
-				>=x11-drivers/xf86-input-dynapro-1.1.0
-				>=x11-drivers/xf86-input-elo2300-1.1.0
-				>=x11-drivers/xf86-input-elographics-1.1.0
-				>=x11-drivers/xf86-input-fpit-1.1.0
-				>=x11-drivers/xf86-input-hyperpen-1.1.0
-				>=x11-drivers/xf86-input-jamstudio-1.1.0
-				>=x11-drivers/xf86-input-joystick-1.1.0
-				>=x11-drivers/xf86-input-keyboard-1.1.0
-				>=x11-drivers/xf86-input-magellan-1.1.0
-				x11-drivers/xf86-input-magictouch
-				>=x11-drivers/xf86-input-microtouch-1.1.0
-				>=x11-drivers/xf86-input-mouse-1.1.0
-				>=x11-drivers/xf86-input-mutouch-1.1.0
-				>=x11-drivers/xf86-input-palmax-1.1.0
-				>=x11-drivers/xf86-input-penmount-1.1.0
-				>=x11-drivers/xf86-input-spaceorb-1.1.0
-				>=x11-drivers/xf86-input-summa-1.1.0
-				>=x11-drivers/xf86-input-tek4957-1.1.0
-				>=x11-drivers/xf86-input-void-1.1.0
-
-				kernel_linux? (
-					>=x11-drivers/xf86-input-aiptek-1.0.1
-					>=x11-drivers/xf86-input-evdev-1.1.1
-					>=x11-drivers/xf86-input-ur98-1.1.0
-				)
-
-				x86? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-				amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				ppc? ( x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				ppc64? ( x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-			)
-		)
-	input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 )
-	|| (
-			(
-				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_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_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-				video_cards_nvidia? ( media-video/nvidia-glx )
-				video_cards_fglrx? ( x11-drivers/ati-drivers )
-			)
-			(
-				>=x11-drivers/xf86-video-dummy-0.2.0
-				>=x11-drivers/xf86-video-fbdev-0.2.0
-
-				!hppa? (
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-				)
-
-				3dfx? ( >=media-libs/glide-v3-3.10 )
-
-				alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				amd64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				arm? ( >=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ia64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				mips? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-				ppc? ( >=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ppc64? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-				sparc? (
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sunbw2-1.1.0
-					>=x11-drivers/xf86-video-suncg14-1.1.0
-					>=x11-drivers/xf86-video-suncg3-1.1.0
-					>=x11-drivers/xf86-video-suncg6-1.1.0
-					>=x11-drivers/xf86-video-sunffb-1.1.0
-					>=x11-drivers/xf86-video-sunleo-1.1.0
-					>=x11-drivers/xf86-video-suntcx-1.1.0
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nsc-2.8.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86-fbsd? (
-					>=x11-drivers/xf86-video-vmware-10.13.0 )
-			)
-		)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	# 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-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-
-	# 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
-
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
-		${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
-		einfo "Removing unused kdrive drivers ..."
-		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}
-			if ! use ${card}; 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
-
-		# Only need to reconf if we're modifying kdrive's Makefile.am
-		x-modular_reconf_source
-	fi
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}