Clean up.
authorDonnie Berkholz <dberkholz@gentoo.org>
Wed, 24 Jan 2007 06:25:19 +0000 (06:25 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Wed, 24 Jan 2007 06:25:19 +0000 (06:25 +0000)
Package-Manager: portage-2.1.2

18 files changed:
x11-base/xorg-server/Manifest
x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch [deleted file]
x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch [deleted file]
x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.1.1 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 [deleted file]
x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1 [deleted file]
x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff [deleted file]
x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch [deleted file]
x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.1.1.ebuild [deleted file]
x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild [deleted file]

index 71954a99c2d161902b446caf75dc9f17f39e3fba..9faff9f0b7d7e26a6aed0658b583d7a1b4a3fbcf 100644 (file)
@@ -46,10 +46,6 @@ AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92f
 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
-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 1.1.1-dbe-render.diff 5323 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 SHA1 67cfe51fdf314db3cf712cb180bdc7635788ffa3 SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab
 MD5 cffab2cec60a2af892e2853840cf2659 files/1.1.1-dbe-render.diff 5323
 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 files/1.1.1-dbe-render.diff 5323
@@ -78,14 +74,6 @@ AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdb
 MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 files/1.1.1-sparc64-ati-lockups.patch 652
-AUX 1.1.99.903-mesa-6.5.2.patch 417 RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290095 SHA1 43addaea42f9308193770c12371960db24ab7db6 SHA256 49688c9c03977b7d23b5523195104caea91a0a77375820761eb264549d5df1e0
-MD5 4b10725076194e7e63c96eb44afa9090 files/1.1.99.903-mesa-6.5.2.patch 417
-RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290095 files/1.1.99.903-mesa-6.5.2.patch 417
-SHA256 49688c9c03977b7d23b5523195104caea91a0a77375820761eb264549d5df1e0 files/1.1.99.903-mesa-6.5.2.patch 417
-AUX 1.1.99.903-sparc-includes.patch 447 RMD160 a0aae498274c96fc5d305e044d109747fcf8dbc5 SHA1 460372939ddd0e2814123e3d6ceaa541124e16e8 SHA256 3fb8dfa651b9ae340551839f38f0713220758fc82ea8e2dc9e2e9cfca337b5f6
-MD5 b69ef0b3698a75c71a74176cb117c17f files/1.1.99.903-sparc-includes.patch 447
-RMD160 a0aae498274c96fc5d305e044d109747fcf8dbc5 files/1.1.99.903-sparc-includes.patch 447
-SHA256 3fb8dfa651b9ae340551839f38f0713220758fc82ea8e2dc9e2e9cfca337b5f6 files/1.1.99.903-sparc-includes.patch 447
 AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
 MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
@@ -130,18 +118,10 @@ AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e99
 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 xorg-server-1.1.0-setuid.diff 3373 RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 SHA1 256aa1ef94425f461c97a6e42b282aaf401fcd14 SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9
-MD5 d806558d64462780cbd1512ab6dc4dd7 files/xorg-server-1.1.0-setuid.diff 3373
-RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 files/xorg-server-1.1.0-setuid.diff 3373
-SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9 files/xorg-server-1.1.0-setuid.diff 3373
 AUX xorg-server-1.1.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 SHA1 435f5d3c410a7e17b31c27c44a1f36145db626ea SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269
 MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
-AUX xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747 RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 SHA1 60ccfea12bddf6cf0a7f56000472781442b10701 SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff
-MD5 ce57ec7f21491975d11f38b346156640 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
-RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
-SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
 AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
@@ -154,49 +134,22 @@ DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15
 DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
-DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
-DIST xorg-server-1.1.99.903.tar.bz2 5980396 RMD160 f6039cab1f233d2785b147e0963ccb90dcd735cd SHA1 e63ebbd368ca0f962de2f1e6a7720473e12f2d9b SHA256 da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde
 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
-EBUILD xorg-server-1.0.2-r7.ebuild 6207 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c3ebabbc SHA1 66a4270e67628e85aad083598ac5ca1f89f1115b SHA256 6aaa82962aea02ed734f0472ef3e34cbed88d5b0c0673bf8bb0e2d5bf2e73c35
-MD5 2d90cbe6238854aa56a67b693a893367 xorg-server-1.0.2-r7.ebuild 6207
-RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c3ebabbc xorg-server-1.0.2-r7.ebuild 6207
-SHA256 6aaa82962aea02ed734f0472ef3e34cbed88d5b0c0673bf8bb0e2d5bf2e73c35 xorg-server-1.0.2-r7.ebuild 6207
 EBUILD xorg-server-1.0.2-r8.ebuild 6241 RMD160 bea6093cdb91552bbe4dcd0da3ca89e291f6ba87 SHA1 9fdc7137754cccd1f897d4c993598a6ca0b4e02e SHA256 f8de9a732229e40a659e3044bc1342706a1eb700ef401fe29d6f7978d18f5e26
 MD5 4f35b2183c4ec37d6aef36ffee598a00 xorg-server-1.0.2-r8.ebuild 6241
 RMD160 bea6093cdb91552bbe4dcd0da3ca89e291f6ba87 xorg-server-1.0.2-r8.ebuild 6241
 SHA256 f8de9a732229e40a659e3044bc1342706a1eb700ef401fe29d6f7978d18f5e26 xorg-server-1.0.2-r8.ebuild 6241
-EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 SHA1 24066b45f3409cc7516ce0f34395f408943c69a8 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995
-MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569
-RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569
-SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569
 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
 RMD160 e055625b08964f7f4a96e795127eb13a25a01f66 xorg-server-1.1.1-r1.ebuild 17208
 SHA256 c79f9f7bb2fb2077480415a2162e4fe7612d9eeccda90e2f4d51e7af8b6aa173 xorg-server-1.1.1-r1.ebuild 17208
-EBUILD xorg-server-1.1.1-r2.ebuild 17267 RMD160 3067b3ef7cdfa3ae7112e3c0e190962e2b613386 SHA1 baa69cd9d0ce14d984a71b134b0a3c1a52ed67eb SHA256 81441719c2581da75d02e4b12a91d9eb9d1e4cb4e51c028f6708b01d92b9144c
-MD5 72ab4ec77f0904adb8b89baa810bb068 xorg-server-1.1.1-r2.ebuild 17267
-RMD160 3067b3ef7cdfa3ae7112e3c0e190962e2b613386 xorg-server-1.1.1-r2.ebuild 17267
-SHA256 81441719c2581da75d02e4b12a91d9eb9d1e4cb4e51c028f6708b01d92b9144c xorg-server-1.1.1-r2.ebuild 17267
-EBUILD xorg-server-1.1.1-r3.ebuild 17313 RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 SHA1 1e69cb292e21eecd60df57f55ae7acd7aba40c60 SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8
-MD5 845f1194f18874f9ac22d3049ac08823 xorg-server-1.1.1-r3.ebuild 17313
-RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 xorg-server-1.1.1-r3.ebuild 17313
-SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8 xorg-server-1.1.1-r3.ebuild 17313
 EBUILD xorg-server-1.1.1-r4.ebuild 17415 RMD160 3e31dc8a150944394dbf7c5852252f4e00f47e76 SHA1 9079fc60cbde35a1209b17dda6b2c79676ee705d SHA256 2901abce1366730d03c3d7fd6e33b415c7b146f56098f66fceb772bf86df26b4
 MD5 9eb67accbfd20a520b21d104ff4eee31 xorg-server-1.1.1-r4.ebuild 17415
 RMD160 3e31dc8a150944394dbf7c5852252f4e00f47e76 xorg-server-1.1.1-r4.ebuild 17415
 SHA256 2901abce1366730d03c3d7fd6e33b415c7b146f56098f66fceb772bf86df26b4 xorg-server-1.1.1-r4.ebuild 17415
-EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
-MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
-RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
-SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-EBUILD xorg-server-1.1.99.903-r1.ebuild 16880 RMD160 83973706cd6bb9ab525faea57990a59ee70875b2 SHA1 fcfd4970a6843d8a449f1f50191b0f96611563db SHA256 4faee7adae1d64ca9534047ed0f8307944d1be9059308f0f492dd1260b803411
-MD5 38a01755f5f88c828b2c67fb465932a3 xorg-server-1.1.99.903-r1.ebuild 16880
-RMD160 83973706cd6bb9ab525faea57990a59ee70875b2 xorg-server-1.1.99.903-r1.ebuild 16880
-SHA256 4faee7adae1d64ca9534047ed0f8307944d1be9059308f0f492dd1260b803411 xorg-server-1.1.99.903-r1.ebuild 16880
 EBUILD xorg-server-1.2.0.ebuild 16451 RMD160 126d3e4450523932ab1a921c55dce2f521cebedd SHA1 ed590af811ddf8ea72748500803b8e52e23c5420 SHA256 3edddd3839e46909ae9f0cc843f6a13197b78786f0ae8e7fe1082df5b272d91e
 MD5 fcd4f030381376c4752c7edce936cbcf xorg-server-1.2.0.ebuild 16451
 RMD160 126d3e4450523932ab1a921c55dce2f521cebedd xorg-server-1.2.0.ebuild 16451
@@ -205,41 +158,23 @@ 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
-MISC ChangeLog 44645 RMD160 fda636fa8a79d36779255f2e569829cee4160487 SHA1 256f5a3a76590f64d6a1d612379462f83d8385f8 SHA256 dd1650ed466078c9f1bd7f888e4742e1961d416afbe377244ecc2a6937d1700a
-MD5 61486a74529741f0754dc2c3483ff6bd ChangeLog 44645
-RMD160 fda636fa8a79d36779255f2e569829cee4160487 ChangeLog 44645
-SHA256 dd1650ed466078c9f1bd7f888e4742e1961d416afbe377244ecc2a6937d1700a ChangeLog 44645
+MISC ChangeLog 45124 RMD160 23466042bc90a80f0bf439eabf13eaa34362bcf4 SHA1 53b0bb33707a6cb4099f76771d267907544829db SHA256 93e1ebc5fd69076f75d7fa7156c312e2e8ab80e2d4af3730a06eecc390ccdb4e
+MD5 3215cd1dddc3a330ea3b3c0ca722ba73 ChangeLog 45124
+RMD160 23466042bc90a80f0bf439eabf13eaa34362bcf4 ChangeLog 45124
+SHA256 93e1ebc5fd69076f75d7fa7156c312e2e8ab80e2d4af3730a06eecc390ccdb4e ChangeLog 45124
 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-r7 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r7 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r7 771
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r8 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r8 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r8 771
-MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0-r1 500
-RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0-r1 500
-SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0-r1 500
-MD5 5bbe7de7ebbf30c9991b3fd800b1f219 files/digest-xorg-server-1.1.1 500
-RMD160 0a5b1d758ab4077ac728b7ec6cc7f06fb49ce273 files/digest-xorg-server-1.1.1 500
-SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/digest-xorg-server-1.1.1 500
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r2 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r2 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r2 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r3 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r3 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r3 506
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r4 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r4 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r4 506
-MD5 8203c18c558952f0a69a3fca15af4f09 files/digest-xorg-server-1.1.99.903-r1 521
-RMD160 e2db17a615b6007f008fb44ff9640f087e6879f1 files/digest-xorg-server-1.1.99.903-r1 521
-SHA256 1099d4eb491d583a636bd3b40807688de8819b9db392b88cd6bf11947195a71c files/digest-xorg-server-1.1.99.903-r1 521
 MD5 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0 506
 RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0 506
 SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0 506
diff --git a/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch b/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
deleted file mode 100644 (file)
index 5a91db4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- xserver/xorg/Xprint/Makefile.am    2006/04/21 13:38:39     1.1
-+++ xserver/xorg/Xprint/Makefile.am    2006/04/21 13:38:52
-@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-       -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
--      -DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
-+      -DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
-       -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
- Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch b/x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch
deleted file mode 100644 (file)
index 022c603..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-server-1.1.99.903/GL/mesa/main/Makefile.am.orig       2006-12-03 16:24:27.786630074 +0100
-+++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.am    2006-12-03 16:24:37.985074238 +0100
-@@ -60,6 +60,7 @@
-                     light.c \
-                     lines.c \
-                     matrix.c \
-+                    mipmap.c \
-                     mm.c \
-                     occlude.c \
-                     pixel.c \
diff --git a/x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch b/x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch
deleted file mode 100644 (file)
index 3dfd383..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=159671
-
-diff --git a/configure.ac b/configure.ac
-index 38fdc86..4c29909 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1129,10 +1129,6 @@ dnl has it in libc), or if libdl is needed to get it.
-               # on kernels < 2.5.42 it's called 'rate' instead.
-               AC_TRY_COMPILE([
- #include <linux/kd.h>
--#ifdef __sparc__
--#include <asm/param.h>
--#include <asm/kbio.h>
--#endif
- ],[
- int main () { 
-       struct kbd_repeat k;
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7
deleted file mode 100644 (file)
index b2e8218..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
-RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
-SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
-MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
-RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
-SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1
deleted file mode 100644 (file)
index 33bc255..0000000
+++ /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 d070c58a598fb52c5cb86344725c4ad6 xorg-server-1.1.0.tar.bz2 6322751
-RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 xorg-server-1.1.0.tar.bz2 6322751
-SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461 xorg-server-1.1.0.tar.bz2 6322751
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1
deleted file mode 100644 (file)
index 740e340..0000000
+++ /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 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2
deleted file mode 100644 (file)
index 1330edc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3
deleted file mode 100644 (file)
index 1330edc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1
deleted file mode 100644 (file)
index 0364100..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 aa7d6b3577d4d851faf1c591df490bd5 xorg-server-1.1.99.903.tar.bz2 5980396
-RMD160 f6039cab1f233d2785b147e0963ccb90dcd735cd xorg-server-1.1.99.903.tar.bz2 5980396
-SHA256 da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde xorg-server-1.1.99.903.tar.bz2 5980396
diff --git a/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff b/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
deleted file mode 100644 (file)
index 96d2d0a..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.33.2.2
-diff -u -u -r1.33.2.2 xf86Init.c
---- hw/xfree86/common/xf86Init.c       9 May 2006 18:04:19 -0000       1.33.2.2
-+++ hw/xfree86/common/xf86Init.c       20 Jun 2006 08:33:03 -0000
-@@ -1905,7 +1905,11 @@
-           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-           break;
-       case 0:  /* child */
--          setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+            xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+                       strerror(errno));
-+            exit(255);
-+        }
-           /* set stdin, stdout to the consoleFd */
-           for (i = 0; i < 2; i++) {
-             if (xf86Info.consoleFd != i) {
-Index: hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
-retrieving revision 1.11
-diff -u -u -r1.11 libc_wrapper.c
---- hw/xfree86/os-support/shared/libc_wrapper.c        25 Mar 2006 19:52:04 -0000      1.11
-+++ hw/xfree86/os-support/shared/libc_wrapper.c        20 Jun 2006 08:33:03 -0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
-       xf86DisableIO();
- #endif
--        setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+              ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+              exit(255);
-+      }
- #if !defined(SELF_CONTAINED_WRAPPER)
-         /* set stdin, stdout to the consoleFD, and leave stderr alone */
-         for (i = 0; i < 2; i++)
-Index: hw/xfree86/parser/write.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
-retrieving revision 1.3
-diff -u -u -r1.3 write.c
---- hw/xfree86/parser/write.c  3 Jul 2005 07:01:37 -0000       1.3
-+++ hw/xfree86/parser/write.c  20 Jun 2006 08:33:03 -0000
-@@ -170,7 +170,10 @@
-                                       strerror(errno));
-                       return 0;
-               case 0: /* child */
--                      setuid(getuid());
-+                      if (setuid(getuid()) == -1) 
-+                          FatalError("xf86writeConfigFile(): "
-+                              "setuid failed(%s)\n", 
-+                              strerror(errno));
-                       ret = doWriteConfigFile(filename, cptr);
-                       exit(ret);
-                       break;
-Index: os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
-retrieving revision 1.25
-diff -u -u -r1.25 utils.c
---- os/utils.c 25 Mar 2006 19:52:05 -0000      1.25
-+++ os/utils.c 20 Jun 2006 08:33:04 -0000
-@@ -1721,8 +1721,10 @@
-     case -1:  /* error */
-       p = -1;
-     case 0:   /* child */
--      setgid(getgid());
--      setuid(getuid());
-+      if (setgid(getgid()) == -1)
-+          _exit(127);
-+      if (setuid(getuid()) == -1)
-+          _exit(127);
-       execl("/bin/sh", "sh", "-c", command, (char *)NULL);
-       _exit(127);
-     default:  /* parent */
-@@ -1773,8 +1775,10 @@
-       xfree(cur);
-       return NULL;
-     case 0:   /* child */
--      setgid(getgid());
--      setuid(getuid());
-+      if (setgid(getgid()) == -1)
-+          _exit(127);
-+      if (setuid(getuid()) == -1)
-+          _exit(127);
-       if (*type == 'r') {
-           if (pdes[1] != 1) {
-               /* stdout */
-@@ -1848,8 +1852,10 @@
-       xfree(cur);
-       return NULL;
-     case 0:   /* child */
--      setgid(getgid());
--      setuid(getuid());
-+      if (setgid(getgid()) == -1)
-+          _exit(127);
-+      if (setuid(getuid()) == -1)
-+          _exit(127);
-       if (*type == 'r') {
-           if (pdes[1] != 1) {
-               /* stdout */
diff --git a/x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch b/x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch
deleted file mode 100644 (file)
index 181273c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
---- xorg-server-9999/GL/glx/indirect_table.c.orig      2006-10-12 16:02:06.000000000 +0800
-+++ xorg-server-9999/GL/glx/indirect_table.c   2006-10-12 16:15:35.000000000 +0800
-@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di
- /*****************************************************************/
- /* tree depth = 13 */
--static const int_fast16_t VendorPriv_dispatch_tree[155] = {
-+static const int_fast16_t VendorPriv_dispatch_tree[159] = {
-     /* [0] -> opcode range [0, 131072], node depth 1 */
-     2,
-     5,
-@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis
-     /* [152] -> opcode range [65536, 65552], node depth 13 */
-     1,
-     LEAF(88),
-+    156,
-     EMPTY_LEAF,
-+    /* [156] -> opcode range [65544, 65552], node depth 13 */
-+    1,
-+    LEAF(96),
-+    EMPTY_LEAF,
- };
--static const void *VendorPriv_function_table[96][2] = {
-+static const void *VendorPriv_function_table[99][2] = {
-     /* [  0] =     0 */ {NULL, NULL},
-     /* [  1] =     1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
-     /* [  2] =     2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
-@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t
-     /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
-     /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
-     /* [ 95] = 65543 */ {NULL, NULL},
-+    /* [ 96] = 65544 */ {NULL, NULL},
-+    /* [ 97] = 65545 */ {NULL, NULL},
-+    /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
- };
- const struct __glXDispatchInfo VendorPriv_dispatch_info = {
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild
deleted file mode 100644 (file)
index bc32fe3..0000000
+++ /dev/null
@@ -1,208 +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.2-r7.ebuild,v 1.6 2006/09/08 18:36:21 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit flag-o-matic x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.4.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${P}-Sbus.patch
-       ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
-       ${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
-       ${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
-       ${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
-       ${FILESDIR}/${P}-64bit-fix-for-glx.patch
-       ${FILESDIR}/${P}-Xprt-build.patch
-       ${FILESDIR}/${P}-xprint-init.patch
-       ${FILESDIR}/${PV}-Xprint-xprintdir.patch
-       ${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
-       ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
-       ${DISTDIR}/${PV}-overlay-window.patch.bz2
-       ${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch
-       ${FILESDIR}/${PV}-fix-rom-read-dualhead.patch
-       ${FILESDIR}/x11r7.0-setuid.diff"
-
-SRC_URI="${SRC_URI}
-       mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-       http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.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="dri ipv6 minimal 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
-       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"
-       # 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
-       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.1_pre20051013
-       !minimal? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-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
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable !minimal dmx)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable dri)
-               $(use_enable xprint)
-               --with-mesa-source=${WORKDIR}/${MESA_P}
-               --enable-xorg
-               --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"
-
-       # (#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_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       use xprint && xprint_src_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
-}
-
-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*
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
deleted file mode 100644 (file)
index 200fe74..0000000
+++ /dev/null
@@ -1,707 +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.1.0-r1.ebuild,v 1.22 2006/10/06 21:57:29 wolf31o2 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"
-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
-       ${FILESDIR}/${P}-setuid.diff"
-
-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_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
-       x11-libs/xtrans
-       x11-libs/libXau
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libxkbfile
-       x11-libs/libXdmcp
-       x11-libs/libXmu
-       x11-libs/libXrender
-       x11-libs/libXi
-       media-libs/freetype
-       >=media-libs/mesa-6.5-r2
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-misc-misc
-       media-fonts/font-cursor-misc
-       x11-misc/xbitmaps
-       || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-       x11-apps/iceauth
-       x11-apps/rgb
-       x11-apps/xauth
-       x11-apps/xinit
-       app-admin/eselect-opengl
-       x11-libs/libXaw
-       x11-libs/libXpm
-       x11-libs/libXxf86misc
-       x11-libs/libXxf86vm
-       dmx? ( x11-libs/libdmx )
-       !minimal? ( x11-libs/libXtst
-               x11-libs/libXres )
-       >=x11-libs/libxkbui-1.0.2
-       x11-libs/liblbxutil
-       kdrive? ( sdl? ( media-libs/libsdl ) )"
-       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
-       # Xaw is dmx- and xorgcfg-dependent
-       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-       # Xxf86misc and Xxf86vm are xorgcfg-dependent
-       # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       x11-proto/damageproto
-       x11-proto/xextproto
-       x11-proto/xproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86rushproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86bigfontproto
-       >=x11-proto/compositeproto-0.3
-       x11-proto/recordproto
-       x11-proto/resourceproto
-       x11-proto/videoproto
-       >=x11-proto/scrnsaverproto-1.1.0
-       x11-proto/evieext
-       x11-proto/trapproto
-       >=x11-proto/xineramaproto-1.1-r1
-       x11-proto/fontsproto
-       >=x11-proto/kbproto-1.0-r1
-       x11-proto/inputproto
-       x11-proto/bigreqsproto
-       x11-proto/xcmiscproto
-       >=x11-proto/glproto-1.4.6
-       dmx? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-
-# Drivers
-###############################################################################
-###############################################################################
-##                                                                           ##
-##   REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES   ##
-##                                                                           ##
-###############################################################################
-###############################################################################
-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 )
-                       )
-                       !minimal? (
-                               >=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-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-drivers/linuxwacom
-                               )
-                               x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-                               amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-                                       x11-drivers/synaptics
-                                       x11-drivers/linuxwacom
-                               )
-                               ppc? ( x11-drivers/synaptics
-                                       x11-drivers/linuxwacom
-                               )
-                               ppc64? ( x11-drivers/synaptics
-                                       x11-drivers/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_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
-                                       )
-                               )
-                       )
-                       !minimal? (
-                               >=x11-drivers/xf86-video-dummy-0.2.0
-                               >=x11-drivers/xf86-video-fbdev-0.2.0
-
-                               !hppa? (
-                                       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-ati-6.6.0
-                                       >=x11-drivers/xf86-video-glint-1.1.1
-                                       >=x11-drivers/xf86-video-mga-1.4.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-sisusb-0.8.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-ati-6.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-mga-1.4.1
-                                       >=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-sisusb-0.8.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-ati-6.6.0
-                                       >=x11-drivers/xf86-video-chips-1.1.1
-                                       >=x11-drivers/xf86-video-glint-1.1.1
-                                       >=x11-drivers/xf86-video-mga-1.4.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-sisusb-0.8.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-ati-6.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-mga-1.4.1
-                                       >=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-sisusb-0.8.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-impact-0.2.0
-                                       >=x11-drivers/xf86-video-newport-0.2.0 )
-                               ppc? ( >=x11-drivers/xf86-video-ati-6.6.0
-                                       >=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-mga-1.4.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-sisusb-0.8.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-ati-6.6.0
-                                       >=x11-drivers/xf86-video-mga-1.4.1
-                                       >=x11-drivers/xf86-video-nv-1.1.1
-                                       >=x11-drivers/xf86-video-sisusb-0.8.1 )
-                               sparc? ( >=x11-drivers/xf86-video-ati-6.6.0
-                                       >=x11-drivers/xf86-video-glint-1.1.1
-                                       >=x11-drivers/xf86-video-mga-1.4.1
-                                       >=x11-drivers/xf86-video-savage-2.1.1
-                                       >=x11-drivers/xf86-video-sisusb-0.8.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-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-ati-6.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-mga-1.4.1
-                                       >=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-sisusb-0.8.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() {
-       use minimal || ensure_a_server_is_building
-
-       # Bug #145274 - anything that uses vm86.h is broken on AMD64
-       if use kdrive && use amd64 && use video_cards_vesa; then
-               eerror "kdrive's VESA driver does not build on AMD64 because it uses"
-               eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
-               die "kdrive's VESA driver does not build on AMD64."
-       fi
-
-       # SDL only available in kdrive build
-       if use kdrive && use sdl; then
-               conf_opts="${conf_opts} --enable-xsdl"
-       else
-               conf_opts="${conf_opts} --disable-xsdl"
-       fi
-
-       # Only Xorg and Xgl support this, and we won't build Xgl
-       # until it merges to trunk
-       if use xorg; then
-               conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-       fi
-
-       # localstatedir is used for the log location; we need to override the default
-       # from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # --enable-install-setuid needed because sparcs default off
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable dmx)
-               $(use_enable kdrive)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable 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
-                       # (bug #136370) Radeon needs fbdev and vesa
-                       if use video_cards_radeon; then
-                               if [[ ${card} = video_cards_fbdev ]] \
-                                       || [[ ${card} = video_cards_vesa ]]; then
-                                       continue
-                               fi
-                       fi
-
-                       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
-       fi
-
-       # Make sure eautoreconf gets run if we need the autoconf/make
-       # changes.
-       if [[ ${SNAPSHOT} != "yes" ]]; then
-               if use kdrive || use xprint; then
-                       eautoreconf
-               fi
-       fi
-       x-modular_reconf_source
-}
-
-src_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       server_based_install
-}
-
-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
-}
-
-dynamic_libgl_install() {
-       # next section is to setup the dynamic libGL stuff
-       ebegin "Moving GL files for dynamic switching"
-               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-               local x=""
-               for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-                       if [ -f ${x} -o -L ${x} ]; then
-                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-                       fi
-               done
-       eend 0
-}
-
-server_based_install() {
-       use xprint && xprint_src_install
-
-       if ! use xorg; then
-               rm ${D}/usr/share/man/man1/Xserver.1x \
-                       ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       ${D}/usr/share/man/man1/Xserver.1x
-       fi
-}
-
-switch_opengl_implem() {
-               # Switch to the xorg implementation.
-               # Use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               echo
-#              eselect opengl set --use-old ${OPENGL_DIR}
-               eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-       # RH-style init script, we provide a wrapper
-       exeinto /usr/$(get_libdir)/misc
-       doexe ${S}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # Patch profile scripts
-       sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-               get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-               ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-       # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-       dodoc ${D}/etc/profile.d/xprint*
-       rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-       for server in ${IUSE_SERVERS}; do
-               use ${server} && return;
-       done
-       eerror "You need to specify at least one server to build."
-       eerror "Valid servers are: ${IUSE_SERVERS}."
-       die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild
deleted file mode 100644 (file)
index 0f430c9..0000000
+++ /dev/null
@@ -1,552 +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.1.1-r2.ebuild,v 1.1 2006/11/09 16:05:49 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.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-       mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-       http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-       input_devices_acecad
-       input_devices_aiptek
-       input_devices_calcomp
-       input_devices_citron
-       input_devices_digitaledge
-       input_devices_dmc
-       input_devices_dynapro
-       input_devices_elo2300
-       input_devices_elographics
-       input_devices_evdev
-       input_devices_fpit
-       input_devices_hyperpen
-       input_devices_jamstudio
-       input_devices_joystick
-       input_devices_keyboard
-       input_devices_magellan
-       input_devices_microtouch
-       input_devices_mouse
-       input_devices_mutouch
-       input_devices_palmax
-       input_devices_penmount
-       input_devices_spaceorb
-       input_devices_summa
-       input_devices_tek4957
-       input_devices_ur98
-       input_devices_vmmouse
-       input_devices_void
-
-       input_devices_synaptics
-       input_devices_wacom"
-IUSE_VIDEO_CARDS="
-       video_cards_apm
-       video_cards_ark
-       video_cards_chips
-       video_cards_cirrus
-       video_cards_cyrix
-       video_cards_dummy
-       video_cards_epson
-       video_cards_fbdev
-       video_cards_glint
-       video_cards_i128
-       video_cards_i740
-       video_cards_i810
-       video_cards_impact
-       video_cards_imstt
-       video_cards_mach64
-       video_cards_mga
-       video_cards_neomagic
-       video_cards_newport
-       video_cards_nsc
-       video_cards_nv
-       video_cards_r128
-       video_cards_radeon
-       video_cards_rendition
-       video_cards_s3
-       video_cards_s3virge
-       video_cards_savage
-       video_cards_siliconmotion
-       video_cards_sis
-       video_cards_sisusb
-       video_cards_sunbw2
-       video_cards_suncg14
-       video_cards_suncg3
-       video_cards_suncg6
-       video_cards_sunffb
-       video_cards_sunleo
-       video_cards_suntcx
-       video_cards_tdfx
-       video_cards_tga
-       video_cards_trident
-       video_cards_tseng
-       video_cards_v4l
-       video_cards_vesa
-       video_cards_vga
-       video_cards_via
-       video_cards_vmware
-       video_cards_voodoo
-
-       video_cards_fglrx
-       video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-       ${IUSE_INPUT_DEVICES}
-       ${IUSE_SERVERS}
-       3dfx
-       aiglx
-       dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-       x11-libs/xtrans
-       x11-libs/libXau
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libxkbfile
-       x11-libs/libXdmcp
-       x11-libs/libXmu
-       x11-libs/libXrender
-       x11-libs/libXi
-       media-libs/freetype
-       >=media-libs/mesa-6.5-r2
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-misc-misc
-       media-fonts/font-cursor-misc
-       x11-misc/xbitmaps
-       || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-       x11-apps/iceauth
-       x11-apps/rgb
-       x11-apps/xauth
-       x11-apps/xinit
-       app-admin/eselect-opengl
-       x11-libs/libXaw
-       x11-libs/libXpm
-       x11-libs/libXxf86misc
-       x11-libs/libXxf86vm
-       dmx? ( x11-libs/libdmx )
-       !minimal? ( x11-libs/libXtst
-               x11-libs/libXres )
-       >=x11-libs/libxkbui-1.0.2
-       x11-libs/liblbxutil
-       kdrive? ( sdl? ( media-libs/libsdl ) )"
-       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
-       # Xaw is dmx- and xorgcfg-dependent
-       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-       # Xxf86misc and Xxf86vm are xorgcfg-dependent
-       # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       x11-proto/damageproto
-       x11-proto/xextproto
-       x11-proto/xproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86rushproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86bigfontproto
-       >=x11-proto/compositeproto-0.3
-       x11-proto/recordproto
-       x11-proto/resourceproto
-       x11-proto/videoproto
-       >=x11-proto/scrnsaverproto-1.1.0
-       x11-proto/evieext
-       x11-proto/trapproto
-       >=x11-proto/xineramaproto-1.1-r1
-       x11-proto/fontsproto
-       >=x11-proto/kbproto-1.0-r1
-       x11-proto/inputproto
-       x11-proto/bigreqsproto
-       x11-proto/xcmiscproto
-       >=x11-proto/glproto-1.4.8
-       dmx? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-       xorg? (
-               input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-               input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-               input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-               input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-               input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-               input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-               input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-               input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-               input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-               input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-               input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-               input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-               input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-               input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-               input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-               input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-               input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-               input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-               input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-               input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-               input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-               input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-               input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-               input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-               input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-               input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-               input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-               input_devices_synaptics? ( x11-drivers/synaptics )
-               input_devices_wacom? ( x11-drivers/linuxwacom )
-
-               video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-               video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-               video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-               video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-               video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-               video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-               video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-               video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-               video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-               video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-               video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-               video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-               video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-               video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-               video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-               video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-               video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-               video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-               video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-               video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-               video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-               video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-               video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-               video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-               video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-               video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-               video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-               video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-               video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-               video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-               video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-               video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-               video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-               video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-               video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-               video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-               video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-               video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-               video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-               video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-               video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-               video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-               video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-               video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-               video_cards_nvidia? ( || (
-                               >=x11-drivers/nvidia-drivers-1.0.8774
-                               >=x11-drivers/nvidia-legacy-drivers-1.0.7184
-                       )
-               )
-       )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-       use minimal || ensure_a_server_is_building
-
-       PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-               ${FILESDIR}/${P}-install-libxf86config-headers.patch
-               ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-               ${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-               ${FILESDIR}/xorg-conf-example.patch
-               ${FILESDIR}/${PV}-fix_acpi_tokenize.patch"
-
-       # Patches required for compiz to work with AIGLX,
-       # but they slow EXA down (bug #147841).
-       if use aiglx; then
-               einfo "AIGLX patches will be applied."
-               ewarn "These patches are known to cause problems with EXA enabled."
-               PATCHES="${FILESDIR}/01-no-move-damage.patch
-                       ${FILESDIR}/02-dont-backfill-bg-none.patch
-                       ${FILESDIR}/03-tfp-damage.patch
-                       ${FILESDIR}/04-mesa-copy-sub-buffer.patch
-                       ${FILESDIR}/05-offscreen-pixmaps.patch
-                       ${FILESDIR}/06-aiglx-happy-vt-switch.patch
-                       ${PATCHES}"
-       fi
-
-       # SDL only available in kdrive build
-       if use kdrive && use sdl; then
-               conf_opts="${conf_opts} --enable-xsdl"
-       else
-               conf_opts="${conf_opts} --disable-xsdl"
-       fi
-
-       # Only Xorg and Xgl support this, and we won't build Xgl
-       # until it merges to trunk
-       if use xorg; then
-               conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-       fi
-
-       # localstatedir is used for the log location; we need to override the default
-       # from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # --enable-install-setuid needed because sparcs default off
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable dmx)
-               $(use_enable kdrive)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable !minimal xorgcfg)
-               $(use_enable !minimal install-libxf86config)
-               $(use_enable dri)
-               $(use_enable xorg)
-               $(use_enable xprint)
-               $(use_enable nptl glx-tls)
-               --sysconfdir=/etc/X11
-               --localstatedir=/var
-               --enable-install-setuid
-               --with-fontdir=/usr/share/fonts
-               ${conf_opts}"
-
-       local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-       if built_with_use media-libs/mesa nptl; then
-               use nptl || die "${diemsg}"
-       else
-               use nptl && die "${diemsg}"
-       fi
-
-       # (#121394) Causes window corruption
-       filter-flags -fweb
-
-       # Nothing else provides new enough glxtokens.h
-       ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-       OLD_IMPLEM="$(eselect opengl show)"
-       eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-       x-modular_specs_check
-       x-modular_dri_check
-       x-modular_unpack_source
-       x-modular_patch_source
-
-       # Set up kdrive servers to build
-       if use kdrive; then
-               kdrive_setup
-       fi
-
-       # Make sure eautoreconf gets run if we need the autoconf/make
-       # changes.
-       if [[ ${SNAPSHOT} != "yes" ]]; then
-               if use kdrive || use xprint; then
-                       eautoreconf
-               fi
-       fi
-       x-modular_reconf_source
-}
-
-src_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       server_based_install
-
-       # Install video mode files for system-config-display
-       insinto /usr/share/xorg
-       doins hw/xfree86/common/{extra,vesa}modes \
-               || die "couldn't install extra modes"
-
-       # Bug #151421 - this file is not built with USE="minimal"
-       # Bug #151670 - this file is also not build if USE="-xorg"
-       if ! use minimal &&     use xorg; then
-               # Install xorg.conf.example
-               insinto /etc/X11
-               doins hw/xfree86/xorg.conf.example \
-                       || die "couldn't install xorg.conf.example"
-       fi
-}
-
-pkg_postinst() {
-       switch_opengl_implem
-
-       # Bug #135544
-       ewarn "Users of reduced blanking now need:"
-       ewarn "   Option \"ReducedBlanking\""
-       ewarn "In the relevant Monitor section(s)."
-       ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-       # Get rid of module dir to ensure opengl-update works properly
-       if ! has_version x11-base/xorg-server; then
-               if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-                       rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-               fi
-       fi
-}
-
-kdrive_setup() {
-       local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-       einfo "Removing unused kdrive drivers ..."
-
-       # Some kdrive servers require fbdev and vesa
-       kdrive_fbdev="radeon neomagic sis siliconmotion"
-       # Some kdrive servers require just vesa
-       kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-       for card in ${IUSE_VIDEO_CARDS}; do
-               real_card=${card#video_cards_}
-
-               # Differences between VIDEO_CARDS name and kdrive server name
-               real_card=${real_card/glint/pm2}
-               real_card=${real_card/radeon/ati}
-               real_card=${real_card/%nv/nvidia}
-               real_card=${real_card/siliconmotion/smi}
-               real_card=${real_card/%sis/sis300}
-
-               disable_card=0
-
-               # Check whether it's a valid kdrive server before we waste time
-               # on the rest of this
-               if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-                       continue
-               fi
-
-               if ! use ${card}; then
-                       if use x86; then
-                               # Some kdrive servers require fbdev and vesa
-                               for i in ${kdrive_fbdev}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = fbdev ]] \
-                                                       || [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                               fi
-                               done
-
-                               # Some kdrive servers require just vesa
-                               for i in ${kdrive_vesa}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                       fi
-                               done
-                       fi
-                       disable_card=1
-               # Bug #150052
-               # fbdev is the only VIDEO_CARDS setting that works on non-x86
-               elif ! use x86 \
-                       && [[ ${real_card} != fbdev ]]; then
-                       ewarn "  $real_card does not work on your architecture; disabling."
-                       disable_card=1
-               fi
-
-               if [[ $disable_card = 1 ]]; then
-                       ebegin "  ${real_card}"
-                       sed -i \
-                               -e "s:\b${real_card}\b::g" \
-                               ${S}/hw/kdrive/Makefile.am \
-                               || die "sed of ${real_card} failed"
-                       eend
-               fi
-
-       done
-
-       # smi and via are the only things on line 2. If line 2 ends up blank,
-       # we need to get rid of the backslash at the end of line 1.
-       if ! use video_cards_siliconmotion && ! use video_cards_via; then
-               sed -i \
-                       -e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-                       ${S}/hw/kdrive/Makefile.am
-       fi
-}
-
-dynamic_libgl_install() {
-       # next section is to setup the dynamic libGL stuff
-       ebegin "Moving GL files for dynamic switching"
-               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-               local x=""
-               for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-                       if [ -f ${x} -o -L ${x} ]; then
-                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-                       fi
-               done
-       eend 0
-}
-
-server_based_install() {
-       use xprint && xprint_src_install
-
-       if ! use xorg; then
-               rm ${D}/usr/share/man/man1/Xserver.1x \
-                       ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       ${D}/usr/share/man/man1/Xserver.1x
-       fi
-}
-
-switch_opengl_implem() {
-               # Switch to the xorg implementation.
-               # Use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               echo
-#              eselect opengl set --use-old ${OPENGL_DIR}
-               eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-       # RH-style init script, we provide a wrapper
-       exeinto /usr/$(get_libdir)/misc
-       doexe ${S}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # Patch profile scripts
-       sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-               get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-               ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-       # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-       dodoc ${D}/etc/profile.d/xprint*
-       rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-       for server in ${IUSE_SERVERS}; do
-               use ${server} && return;
-       done
-       eerror "You need to specify at least one server to build."
-       eerror "Valid servers are: ${IUSE_SERVERS}."
-       die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild
deleted file mode 100644 (file)
index 1729847..0000000
+++ /dev/null
@@ -1,553 +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.1.1-r3.ebuild,v 1.2 2006/12/07 16:49:11 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.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-       mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-       http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-       input_devices_acecad
-       input_devices_aiptek
-       input_devices_calcomp
-       input_devices_citron
-       input_devices_digitaledge
-       input_devices_dmc
-       input_devices_dynapro
-       input_devices_elo2300
-       input_devices_elographics
-       input_devices_evdev
-       input_devices_fpit
-       input_devices_hyperpen
-       input_devices_jamstudio
-       input_devices_joystick
-       input_devices_keyboard
-       input_devices_magellan
-       input_devices_microtouch
-       input_devices_mouse
-       input_devices_mutouch
-       input_devices_palmax
-       input_devices_penmount
-       input_devices_spaceorb
-       input_devices_summa
-       input_devices_tek4957
-       input_devices_ur98
-       input_devices_vmmouse
-       input_devices_void
-
-       input_devices_synaptics
-       input_devices_wacom"
-IUSE_VIDEO_CARDS="
-       video_cards_apm
-       video_cards_ark
-       video_cards_chips
-       video_cards_cirrus
-       video_cards_cyrix
-       video_cards_dummy
-       video_cards_epson
-       video_cards_fbdev
-       video_cards_glint
-       video_cards_i128
-       video_cards_i740
-       video_cards_i810
-       video_cards_impact
-       video_cards_imstt
-       video_cards_mach64
-       video_cards_mga
-       video_cards_neomagic
-       video_cards_newport
-       video_cards_nsc
-       video_cards_nv
-       video_cards_r128
-       video_cards_radeon
-       video_cards_rendition
-       video_cards_s3
-       video_cards_s3virge
-       video_cards_savage
-       video_cards_siliconmotion
-       video_cards_sis
-       video_cards_sisusb
-       video_cards_sunbw2
-       video_cards_suncg14
-       video_cards_suncg3
-       video_cards_suncg6
-       video_cards_sunffb
-       video_cards_sunleo
-       video_cards_suntcx
-       video_cards_tdfx
-       video_cards_tga
-       video_cards_trident
-       video_cards_tseng
-       video_cards_v4l
-       video_cards_vesa
-       video_cards_vga
-       video_cards_via
-       video_cards_vmware
-       video_cards_voodoo
-
-       video_cards_fglrx
-       video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-       ${IUSE_INPUT_DEVICES}
-       ${IUSE_SERVERS}
-       3dfx
-       aiglx
-       dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-       x11-libs/xtrans
-       x11-libs/libXau
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libxkbfile
-       x11-libs/libXdmcp
-       x11-libs/libXmu
-       x11-libs/libXrender
-       x11-libs/libXi
-       media-libs/freetype
-       >=media-libs/mesa-6.5-r2
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-misc-misc
-       media-fonts/font-cursor-misc
-       x11-misc/xbitmaps
-       || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-       x11-apps/iceauth
-       x11-apps/rgb
-       x11-apps/xauth
-       x11-apps/xinit
-       app-admin/eselect-opengl
-       x11-libs/libXaw
-       x11-libs/libXpm
-       x11-libs/libXxf86misc
-       x11-libs/libXxf86vm
-       dmx? ( x11-libs/libdmx )
-       !minimal? ( x11-libs/libXtst
-               x11-libs/libXres )
-       >=x11-libs/libxkbui-1.0.2
-       x11-libs/liblbxutil
-       kdrive? ( sdl? ( media-libs/libsdl ) )"
-       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
-       # Xaw is dmx- and xorgcfg-dependent
-       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-       # Xxf86misc and Xxf86vm are xorgcfg-dependent
-       # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       x11-proto/damageproto
-       x11-proto/xextproto
-       x11-proto/xproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86rushproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86bigfontproto
-       >=x11-proto/compositeproto-0.3
-       x11-proto/recordproto
-       x11-proto/resourceproto
-       x11-proto/videoproto
-       >=x11-proto/scrnsaverproto-1.1.0
-       x11-proto/evieext
-       x11-proto/trapproto
-       >=x11-proto/xineramaproto-1.1-r1
-       x11-proto/fontsproto
-       >=x11-proto/kbproto-1.0-r1
-       x11-proto/inputproto
-       x11-proto/bigreqsproto
-       x11-proto/xcmiscproto
-       >=x11-proto/glproto-1.4.8
-       dmx? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-       xorg? (
-               input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-               input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-               input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-               input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-               input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-               input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-               input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-               input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-               input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-               input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-               input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-               input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-               input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-               input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-               input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-               input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-               input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-               input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-               input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-               input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-               input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-               input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-               input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-               input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-               input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-               input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-               input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-               input_devices_synaptics? ( x11-drivers/synaptics )
-               input_devices_wacom? ( x11-drivers/linuxwacom )
-
-               video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-               video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-               video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-               video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-               video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-               video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-               video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-               video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-               video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-               video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-               video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-               video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-               video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-               video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-               video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-               video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-               video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-               video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-               video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-               video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-               video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-               video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-               video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-               video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-               video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-               video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-               video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-               video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-               video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-               video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-               video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-               video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-               video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-               video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-               video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-               video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-               video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-               video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-               video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-               video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-               video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-               video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-               video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-               video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-               video_cards_nvidia? ( || (
-                               >=x11-drivers/nvidia-drivers-1.0.8774
-                               >=x11-drivers/nvidia-legacy-drivers-1.0.7184
-                       )
-               )
-       )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-       use minimal || ensure_a_server_is_building
-
-       PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-               ${FILESDIR}/${P}-install-libxf86config-headers.patch
-               ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-               ${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-               ${FILESDIR}/xorg-conf-example.patch
-               ${FILESDIR}/${PV}-fix_acpi_tokenize.patch"
-
-       # Patches required for compiz to work with AIGLX,
-       # but they slow EXA down (bug #147841).
-       if use aiglx; then
-               einfo "AIGLX patches will be applied."
-               ewarn "These patches are known to cause problems with EXA enabled."
-               PATCHES="${FILESDIR}/01-no-move-damage.patch
-                       ${FILESDIR}/02-dont-backfill-bg-none.patch
-                       ${FILESDIR}/03-tfp-damage.patch
-                       ${FILESDIR}/04-mesa-copy-sub-buffer.patch
-                       ${FILESDIR}/05-offscreen-pixmaps.patch
-                       ${FILESDIR}/06-aiglx-happy-vt-switch.patch
-                       ${FILESDIR}/${PV}-fix_big_endian_glx.patch
-                       ${PATCHES}"
-       fi
-
-       # SDL only available in kdrive build
-       if use kdrive && use sdl; then
-               conf_opts="${conf_opts} --enable-xsdl"
-       else
-               conf_opts="${conf_opts} --disable-xsdl"
-       fi
-
-       # Only Xorg and Xgl support this, and we won't build Xgl
-       # until it merges to trunk
-       if use xorg; then
-               conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-       fi
-
-       # localstatedir is used for the log location; we need to override the default
-       # from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # --enable-install-setuid needed because sparcs default off
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable dmx)
-               $(use_enable kdrive)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable !minimal xorgcfg)
-               $(use_enable !minimal install-libxf86config)
-               $(use_enable dri)
-               $(use_enable xorg)
-               $(use_enable xprint)
-               $(use_enable nptl glx-tls)
-               --sysconfdir=/etc/X11
-               --localstatedir=/var
-               --enable-install-setuid
-               --with-fontdir=/usr/share/fonts
-               ${conf_opts}"
-
-       local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-       if built_with_use media-libs/mesa nptl; then
-               use nptl || die "${diemsg}"
-       else
-               use nptl && die "${diemsg}"
-       fi
-
-       # (#121394) Causes window corruption
-       filter-flags -fweb
-
-       # Nothing else provides new enough glxtokens.h
-       ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-       OLD_IMPLEM="$(eselect opengl show)"
-       eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-       x-modular_specs_check
-       x-modular_dri_check
-       x-modular_unpack_source
-       x-modular_patch_source
-
-       # Set up kdrive servers to build
-       if use kdrive; then
-               kdrive_setup
-       fi
-
-       # Make sure eautoreconf gets run if we need the autoconf/make
-       # changes.
-       if [[ ${SNAPSHOT} != "yes" ]]; then
-               if use kdrive || use xprint; then
-                       eautoreconf
-               fi
-       fi
-       x-modular_reconf_source
-}
-
-src_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       server_based_install
-
-       # Install video mode files for system-config-display
-       insinto /usr/share/xorg
-       doins hw/xfree86/common/{extra,vesa}modes \
-               || die "couldn't install extra modes"
-
-       # Bug #151421 - this file is not built with USE="minimal"
-       # Bug #151670 - this file is also not build if USE="-xorg"
-       if ! use minimal &&     use xorg; then
-               # Install xorg.conf.example
-               insinto /etc/X11
-               doins hw/xfree86/xorg.conf.example \
-                       || die "couldn't install xorg.conf.example"
-       fi
-}
-
-pkg_postinst() {
-       switch_opengl_implem
-
-       # Bug #135544
-       ewarn "Users of reduced blanking now need:"
-       ewarn "   Option \"ReducedBlanking\""
-       ewarn "In the relevant Monitor section(s)."
-       ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-       # Get rid of module dir to ensure opengl-update works properly
-       if ! has_version x11-base/xorg-server; then
-               if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-                       rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-               fi
-       fi
-}
-
-kdrive_setup() {
-       local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-       einfo "Removing unused kdrive drivers ..."
-
-       # Some kdrive servers require fbdev and vesa
-       kdrive_fbdev="radeon neomagic sis siliconmotion"
-       # Some kdrive servers require just vesa
-       kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-       for card in ${IUSE_VIDEO_CARDS}; do
-               real_card=${card#video_cards_}
-
-               # Differences between VIDEO_CARDS name and kdrive server name
-               real_card=${real_card/glint/pm2}
-               real_card=${real_card/radeon/ati}
-               real_card=${real_card/%nv/nvidia}
-               real_card=${real_card/siliconmotion/smi}
-               real_card=${real_card/%sis/sis300}
-
-               disable_card=0
-
-               # Check whether it's a valid kdrive server before we waste time
-               # on the rest of this
-               if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-                       continue
-               fi
-
-               if ! use ${card}; then
-                       if use x86; then
-                               # Some kdrive servers require fbdev and vesa
-                               for i in ${kdrive_fbdev}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = fbdev ]] \
-                                                       || [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                               fi
-                               done
-
-                               # Some kdrive servers require just vesa
-                               for i in ${kdrive_vesa}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                       fi
-                               done
-                       fi
-                       disable_card=1
-               # Bug #150052
-               # fbdev is the only VIDEO_CARDS setting that works on non-x86
-               elif ! use x86 \
-                       && [[ ${real_card} != fbdev ]]; then
-                       ewarn "  $real_card does not work on your architecture; disabling."
-                       disable_card=1
-               fi
-
-               if [[ $disable_card = 1 ]]; then
-                       ebegin "  ${real_card}"
-                       sed -i \
-                               -e "s:\b${real_card}\b::g" \
-                               ${S}/hw/kdrive/Makefile.am \
-                               || die "sed of ${real_card} failed"
-                       eend
-               fi
-
-       done
-
-       # smi and via are the only things on line 2. If line 2 ends up blank,
-       # we need to get rid of the backslash at the end of line 1.
-       if ! use video_cards_siliconmotion && ! use video_cards_via; then
-               sed -i \
-                       -e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-                       ${S}/hw/kdrive/Makefile.am
-       fi
-}
-
-dynamic_libgl_install() {
-       # next section is to setup the dynamic libGL stuff
-       ebegin "Moving GL files for dynamic switching"
-               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-               local x=""
-               for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-                       if [ -f ${x} -o -L ${x} ]; then
-                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-                       fi
-               done
-       eend 0
-}
-
-server_based_install() {
-       use xprint && xprint_src_install
-
-       if ! use xorg; then
-               rm ${D}/usr/share/man/man1/Xserver.1x \
-                       ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       ${D}/usr/share/man/man1/Xserver.1x
-       fi
-}
-
-switch_opengl_implem() {
-               # Switch to the xorg implementation.
-               # Use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               echo
-#              eselect opengl set --use-old ${OPENGL_DIR}
-               eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-       # RH-style init script, we provide a wrapper
-       exeinto /usr/$(get_libdir)/misc
-       doexe ${S}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # Patch profile scripts
-       sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-               get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-               ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-       # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-       dodoc ${D}/etc/profile.d/xprint*
-       rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-       for server in ${IUSE_SERVERS}; do
-               use ${server} && return;
-       done
-       eerror "You need to specify at least one server to build."
-       eerror "Valid servers are: ${IUSE_SERVERS}."
-       die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
deleted file mode 100644 (file)
index 12bd5f5..0000000
+++ /dev/null
@@ -1,481 +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.1.1.ebuild,v 1.21 2006/10/06 21:57:29 wolf31o2 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"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${PV}-sparc64-ati-lockups.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_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
-       x11-libs/xtrans
-       x11-libs/libXau
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libxkbfile
-       x11-libs/libXdmcp
-       x11-libs/libXmu
-       x11-libs/libXrender
-       x11-libs/libXi
-       media-libs/freetype
-       >=media-libs/mesa-6.5-r2
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-misc-misc
-       media-fonts/font-cursor-misc
-       x11-misc/xbitmaps
-       || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-       x11-apps/iceauth
-       x11-apps/rgb
-       x11-apps/xauth
-       x11-apps/xinit
-       app-admin/eselect-opengl
-       x11-libs/libXaw
-       x11-libs/libXpm
-       x11-libs/libXxf86misc
-       x11-libs/libXxf86vm
-       dmx? ( x11-libs/libdmx )
-       !minimal? ( x11-libs/libXtst
-               x11-libs/libXres )
-       >=x11-libs/libxkbui-1.0.2
-       x11-libs/liblbxutil
-       kdrive? ( sdl? ( media-libs/libsdl ) )"
-       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
-       # Xaw is dmx- and xorgcfg-dependent
-       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-       # Xxf86misc and Xxf86vm are xorgcfg-dependent
-       # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       x11-proto/damageproto
-       x11-proto/xextproto
-       x11-proto/xproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86rushproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86bigfontproto
-       >=x11-proto/compositeproto-0.3
-       x11-proto/recordproto
-       x11-proto/resourceproto
-       x11-proto/videoproto
-       >=x11-proto/scrnsaverproto-1.1.0
-       x11-proto/evieext
-       x11-proto/trapproto
-       >=x11-proto/xineramaproto-1.1-r1
-       x11-proto/fontsproto
-       >=x11-proto/kbproto-1.0-r1
-       x11-proto/inputproto
-       x11-proto/bigreqsproto
-       x11-proto/xcmiscproto
-       >=x11-proto/glproto-1.4.6
-       dmx? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-       xorg? (
-               input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-               input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-               input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-               input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-               input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-               input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-               input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-               input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-               input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-               input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-               input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-               input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-               input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-               input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-               input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-               input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-               input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-               input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-               input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-               input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-               input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-               input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-               input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-               input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-               input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-               input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-               input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-               input_devices_synaptics? ( x11-drivers/synaptics )
-               input_devices_wacom? ( x11-drivers/linuxwacom )
-
-               video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-               video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-               video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-               video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-               video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-               video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-               video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-               video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-               video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-               video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-               video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-               video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-               video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-               video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-               video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-               video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-               video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-               video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-               video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-               video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-               video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-               video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-               video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-               video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-               video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-               video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-               video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-               video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-               video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-               video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-               video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-               video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-               video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-               video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-               video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-               video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-               video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-               video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-               video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-               video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-               video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-               video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-               video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-               video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-               video_cards_nvidia? ( || (
-                               >=x11-drivers/nvidia-drivers-1.0.8774
-                               >=x11-drivers/nvidia-legacy-drivers-1.0.7184
-                       )
-               )
-       )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-       use minimal || ensure_a_server_is_building
-
-       # Bug #145274 - anything that uses vm86.h is broken on AMD64
-       if use kdrive && use amd64 && use video_cards_vesa; then
-               eerror "kdrive's VESA driver does not build on AMD64 because it uses"
-               eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
-               die "kdrive's VESA driver does not build on AMD64."
-       fi
-
-       # SDL only available in kdrive build
-       if use kdrive && use sdl; then
-               conf_opts="${conf_opts} --enable-xsdl"
-       else
-               conf_opts="${conf_opts} --disable-xsdl"
-       fi
-
-       # Only Xorg and Xgl support this, and we won't build Xgl
-       # until it merges to trunk
-       if use xorg; then
-               conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-       fi
-
-       # localstatedir is used for the log location; we need to override the default
-       # from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # --enable-install-setuid needed because sparcs default off
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable dmx)
-               $(use_enable kdrive)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable !minimal xorgcfg)
-               $(use_enable 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
-                       # (bug #136370) Radeon needs fbdev and vesa
-                       if use video_cards_radeon; then
-                               if [[ ${card} = video_cards_fbdev ]] \
-                                       || [[ ${card} = video_cards_vesa ]]; then
-                                       continue
-                               fi
-                       fi
-
-                       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
-       fi
-
-       # Make sure eautoreconf gets run if we need the autoconf/make
-       # changes.
-       if [[ ${SNAPSHOT} != "yes" ]]; then
-               if use kdrive || use xprint; then
-                       eautoreconf
-               fi
-       fi
-       x-modular_reconf_source
-}
-
-src_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       server_based_install
-}
-
-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
-}
-
-dynamic_libgl_install() {
-       # next section is to setup the dynamic libGL stuff
-       ebegin "Moving GL files for dynamic switching"
-               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-               local x=""
-               for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-                       if [ -f ${x} -o -L ${x} ]; then
-                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-                       fi
-               done
-       eend 0
-}
-
-server_based_install() {
-       use xprint && xprint_src_install
-
-       if ! use xorg; then
-               rm ${D}/usr/share/man/man1/Xserver.1x \
-                       ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       ${D}/usr/share/man/man1/Xserver.1x
-       fi
-}
-
-switch_opengl_implem() {
-               # Switch to the xorg implementation.
-               # Use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               echo
-#              eselect opengl set --use-old ${OPENGL_DIR}
-               eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-       # RH-style init script, we provide a wrapper
-       exeinto /usr/$(get_libdir)/misc
-       doexe ${S}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # Patch profile scripts
-       sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-               get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-               ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-       # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-       dodoc ${D}/etc/profile.d/xprint*
-       rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-       for server in ${IUSE_SERVERS}; do
-               use ${server} && return;
-       done
-       eerror "You need to specify at least one server to build."
-       eerror "Valid servers are: ${IUSE_SERVERS}."
-       die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
deleted file mode 100644 (file)
index 2a9d1bb..0000000
+++ /dev/null
@@ -1,544 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild,v 1.3 2007/01/22 05:58:05 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
-       aiglx
-       dri ipv6 minimal nptl sdl xprint"
-RDEPEND=">=x11-libs/libXfont-1.2.5
-       x11-libs/xtrans
-       x11-libs/libXau
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libxkbfile
-       x11-libs/libXdmcp
-       x11-libs/libXmu
-       x11-libs/libXrender
-       x11-libs/libXi
-       media-libs/freetype
-       >=media-libs/mesa-6.5.2
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-misc-misc
-       media-fonts/font-cursor-misc
-       x11-misc/xbitmaps
-       || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-       x11-apps/iceauth
-       x11-apps/rgb
-       x11-apps/xauth
-       x11-apps/xinit
-       app-admin/eselect-opengl
-       x11-libs/libXaw
-       x11-libs/libXpm
-       x11-libs/libXxf86misc
-       x11-libs/libXxf86vm
-       dmx? ( x11-libs/libdmx )
-       !minimal? ( x11-libs/libXtst
-               x11-libs/libXres )
-       >=x11-libs/libxkbui-1.0.2
-       x11-libs/liblbxutil
-       kdrive? ( sdl? ( media-libs/libsdl ) )"
-       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
-       # Xaw is dmx- and xorgcfg-dependent
-       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-       # Xxf86misc and Xxf86vm are xorgcfg-dependent
-       # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-       x11-proto/randrproto
-       x11-proto/renderproto
-       >=x11-proto/fixesproto-4
-       x11-proto/damageproto
-       x11-proto/xextproto
-       x11-proto/xproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86miscproto
-       x11-proto/xf86rushproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xf86bigfontproto
-       >=x11-proto/compositeproto-0.3
-       x11-proto/recordproto
-       x11-proto/resourceproto
-       x11-proto/videoproto
-       >=x11-proto/scrnsaverproto-1.1.0
-       x11-proto/evieext
-       x11-proto/trapproto
-       >=x11-proto/xineramaproto-1.1-r1
-       x11-proto/fontsproto
-       >=x11-proto/kbproto-1.0.3
-       x11-proto/inputproto
-       x11-proto/bigreqsproto
-       x11-proto/xcmiscproto
-       >=x11-proto/glproto-1.4.8
-       dmx? ( x11-proto/dmxproto )
-       dri? ( x11-proto/xf86driproto
-               >=x11-libs/libdrm-2.3 )
-       xprint? ( x11-proto/printproto
-               x11-apps/mkfontdir
-               x11-apps/mkfontscale
-               x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-       xorg? (
-               input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-               input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-               input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-               input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-               input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-               input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-               input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-               input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-               input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-               input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-               input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-               input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-               input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-               input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-               input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-               input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-               input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-               input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-               input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-               input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-               input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-               input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-               input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-               input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-               input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-               input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-               input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-               input_devices_synaptics? ( x11-drivers/synaptics )
-               input_devices_wacom? ( x11-drivers/linuxwacom )
-
-               video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-               video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-               video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-               video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-               video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-               video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-               video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-               video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-               video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-               video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-               video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-               video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-               video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-               video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-               video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-               video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-               video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-               video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-               video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-               video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-               video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-               video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-               video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-               video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-               video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-               video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-               video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-               video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-               video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-               video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-               video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-               video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-               video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-               video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-               video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-               video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-               video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-               video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-               video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-               video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-               video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-               video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-               video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-               video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-               video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-               video_cards_nvidia? ( || (
-                               >=x11-drivers/nvidia-drivers-1.0.8774
-                               >=x11-drivers/nvidia-legacy-drivers-1.0.7184
-                       )
-               )
-       )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-       use minimal || ensure_a_server_is_building
-
-       # Allow build against Mesa 6.5.2
-       PATCHES="${FILESDIR}/${PV}-mesa-6.5.2.patch
-               ${FILESDIR}/${PV}-sparc-includes.patch"
-
-       # Adds missing functionality to GLX to
-       # allow compiz/beryl to work.
-       # https://bugs.freedesktop.org/show_bug.cgi?id=8991
-       if use aiglx; then
-               einfo "AIGLX patches will be applied."
-               PATCHES="${FILESDIR}/xorg-server-1.1.99.901-GetDrawableAttributes.patch
-                       ${PATCHES}"
-       fi
-
-       # SDL only available in kdrive build
-       if use kdrive && use sdl; then
-               conf_opts="${conf_opts} --enable-xsdl"
-       else
-               conf_opts="${conf_opts} --disable-xsdl"
-       fi
-
-       # Only Xorg and Xgl support this, and we won't build Xgl
-       # until it merges to trunk
-       if use xorg; then
-               conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-       fi
-
-       # localstatedir is used for the log location; we need to override the default
-       # from ebuild.sh
-       # sysconfdir is used for the xorg.conf location; same applies
-       # --enable-install-setuid needed because sparcs default off
-       CONFIGURE_OPTIONS="
-               $(use_enable ipv6)
-               $(use_enable dmx)
-               $(use_enable kdrive)
-               $(use_enable !minimal xvfb)
-               $(use_enable !minimal xnest)
-               $(use_enable !minimal 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 || use xprint; then
-                       eautoreconf
-               fi
-       fi
-       x-modular_reconf_source
-}
-
-src_install() {
-       x-modular_src_install
-
-       dynamic_libgl_install
-
-       server_based_install
-
-       # Install video mode files for system-config-display
-       insinto /usr/share/xorg
-       doins hw/xfree86/common/{extra,vesa}modes \
-               || die "couldn't install extra modes"
-
-       # Bug #151421 - this file is not built with USE="minimal"
-       # Bug #151670 - this file is also not build if USE="-xorg"
-       if ! use minimal &&     use xorg; then
-               # Install xorg.conf.example
-               insinto /etc/X11
-               doins hw/xfree86/xorg.conf.example \
-                       || die "couldn't install xorg.conf.example"
-       fi
-}
-
-pkg_postinst() {
-       switch_opengl_implem
-
-       # Bug #135544
-       ewarn "Users of reduced blanking now need:"
-       ewarn "   Option \"ReducedBlanking\""
-       ewarn "In the relevant Monitor section(s)."
-       ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-       # Get rid of module dir to ensure opengl-update works properly
-       if ! has_version x11-base/xorg-server; then
-               if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-                       rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-               fi
-       fi
-}
-
-kdrive_setup() {
-       local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-       einfo "Removing unused kdrive drivers ..."
-
-       # Some kdrive servers require fbdev and vesa
-       kdrive_fbdev="radeon neomagic sis siliconmotion"
-       # Some kdrive servers require just vesa
-       kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-       for card in ${IUSE_VIDEO_CARDS}; do
-               real_card=${card#video_cards_}
-
-               # Differences between VIDEO_CARDS name and kdrive server name
-               real_card=${real_card/glint/pm2}
-               real_card=${real_card/radeon/ati}
-               real_card=${real_card/%nv/nvidia}
-               real_card=${real_card/siliconmotion/smi}
-               real_card=${real_card/%sis/sis300}
-
-               disable_card=0
-
-               # Check whether it's a valid kdrive server before we waste time
-               # on the rest of this
-               if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-                       continue
-               fi
-
-               if ! use ${card}; then
-                       if use x86; then
-                               # Some kdrive servers require fbdev and vesa
-                               for i in ${kdrive_fbdev}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = fbdev ]] \
-                                                       || [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                               fi
-                               done
-
-                               # Some kdrive servers require just vesa
-                               for i in ${kdrive_vesa}; do
-                                       if use video_cards_${i}; then
-                                               if [[ ${real_card} = vesa ]]; then
-                                                       continue 2 # Don't disable
-                                               fi
-                                       fi
-                               done
-                       fi
-                       disable_card=1
-               # Bug #150052
-               # fbdev is the only VIDEO_CARDS setting that works on non-x86
-               elif ! use x86 \
-                       && [[ ${real_card} != fbdev ]]; then
-                       ewarn "  $real_card does not work on your architecture; disabling."
-                       disable_card=1
-               fi
-
-               if [[ $disable_card = 1 ]]; then
-                       ebegin "  ${real_card}"
-                       sed -i \
-                               -e "s:\b${real_card}\b::g" \
-                               ${S}/hw/kdrive/Makefile.am \
-                               || die "sed of ${real_card} failed"
-                       eend
-               fi
-
-       done
-
-       # smi and via are the only things on line 2. If line 2 ends up blank,
-       # we need to get rid of the backslash at the end of line 1.
-       if ! use video_cards_siliconmotion && ! use video_cards_via; then
-               sed -i \
-                       -e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-                       ${S}/hw/kdrive/Makefile.am
-       fi
-}
-
-dynamic_libgl_install() {
-       # next section is to setup the dynamic libGL stuff
-       ebegin "Moving GL files for dynamic switching"
-               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-               local x=""
-               for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-                       if [ -f ${x} -o -L ${x} ]; then
-                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-                       fi
-               done
-       eend 0
-}
-
-server_based_install() {
-       use xprint && xprint_src_install
-
-       if ! use xorg; then
-               rm ${D}/usr/share/man/man1/Xserver.1x \
-                       ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-                       ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-                       ${D}/usr/share/man/man1/Xserver.1x
-       fi
-}
-
-switch_opengl_implem() {
-               # Switch to the xorg implementation.
-               # Use new opengl-update that will not reset user selected
-               # OpenGL interface ...
-               echo
-#              eselect opengl set --use-old ${OPENGL_DIR}
-               eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-       # RH-style init script, we provide a wrapper
-       exeinto /usr/$(get_libdir)/misc
-       doexe ${S}/Xprint/etc/init.d/xprint
-       # Patch init script for fonts location
-       sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-               -i ${D}/usr/$(get_libdir)/misc/xprint
-       # Install the wrapper
-       newinitd ${FILESDIR}/xprint.init xprint
-       # Install profile scripts
-       insinto /etc/profile.d
-       doins ${S}/Xprint/etc/profile.d/xprint*
-       insinto /etc/X11/xinit/xinitrc.d
-       newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-               92xprint-xpserverlist.sh
-       # Patch profile scripts
-       sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-               get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-               ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-       # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-       dodoc ${D}/etc/profile.d/xprint*
-       rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-       for server in ${IUSE_SERVERS}; do
-               use ${server} && return;
-       done
-       eerror "You need to specify at least one server to build."
-       eerror "Valid servers are: ${IUSE_SERVERS}."
-       die "No servers were specified to build."
-}