x11-base/xorg-server: drop old ebuilds, prune ${FILESDIR}

Package-Manager: portage-2.2_rc42/cvs/Linux i686
author: Remi Cardona <remi@gentoo.org> 2009-09-28 07:41:03 +0000
committer: Remi Cardona <remi@gentoo.org> 2009-09-28 07:41:03 +0000
commit: e8d92cb323ccfab1e7fa80515f9ecdd007a417f4 (patch)
tree: c9f4dbffec4253df8ba78b98a2257682c5796943 /x11-base
parent: Version bump (diff)
download: historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.tar.gz
historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.tar.bz2
historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.zip
52 files changed, 47 insertions, 3640 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 313efd8cf96a..d32cac3f440c 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.445 2009/09/19 22:40:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.446 2009/09/28 07:41:02 remi Exp $
+
+  28 Sep 2009; Rémi Cardona <remi@gentoo.org>
+  -files/1.2.0-fix-amd-cpu-detection.patch,
+  -files/1.3.0.0-fix-dual-head-screen-resolutions.patch,
+  -files/xorg-server-sam225bw-quirks.patch,
+  -files/xorg-x11-server-1.0.1-fpic-libxf86config.patch,
+  -files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch,
+  -files/xorg-xserver-1.4-cve-2008-1377.diff,
+  -files/xorg-xserver-1.4-cve-2008-1379.diff,
+  -files/xorg-xserver-1.4-cve-2008-2360.diff,
+  -files/xorg-xserver-1.4-cve-2008-2361.diff,
+  -files/xorg-xserver-1.4-cve-2008-2362.diff, -xorg-server-1.6.3.ebuild,
+  -files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch,
+  -files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch,
+  -files/1.3.0.0-fix-randr-resizing.patch,
+  -files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch,
+  -xorg-server-1.6.3.901.ebuild, -xorg-server-1.6.3.901-r1.ebuild,
+  -files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch,
+  -files/1.2.0-typo-fix.patch,
+  -files/1.2.0-zero-out-client-devprivates-on-allocation.patch,
+  -files/1.3.0.0-fix-xephyr-amd64-segfault.patch,
+  -files/1.3.0.0-fix-xkb-openoffice-hangs.patch,
+  -files/1.3.0.0-ramdac.patch, -files/1.3.0.0-use-proc-instead-of-sys.patch,
+  -files/1.3.0.0-xephyr_crash_at_exit.patch,
+  -files/1.3-alpha-build-fix.patch,
+  -files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch,
+  -files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch,
+  -files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch,
+  -files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch,
+  -files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch,
+  -files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch,
+  -files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch,
+  -files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch,
+  -files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
+  , -files/1.4-document-new-font-catalogs.patch,
+  -files/1.4-dont-hang-openoffice.patch, -files/1.4-fix-dmx-build.patch,
+  -files/1.4-fix-dmx-link.patch, -files/1.4-fix-xephyr-link.patch,
+  -files/1.4-fix-xprint-build.patch, -files/1.4-fix-xprint-link.patch,
+  -files/1.4-ia64.patch, -files/1.4.0.90-clean-generated-files.patch,
+  -files/1.5.2-fix-xvesa-with-new-kernels.patch,
+  -files/1.5.2-force-LC_ALL-C-when-running-awk.patch,
+  -files/1.5.3-builtin-fonts.patch,
+  -files/avoid-crash-on-minimized-xv-window.patch,
+  -files/use-composite-for-unequal-depths.patch, -files/xprint.init:
+  drop old ebuilds, prune ${FILESDIR}
 
   19 Sep 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r6.ebuild,
   xorg-server-1.5.3-r7.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 5601d4de8e78..b28bf3956e0d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,62 +1,11 @@
-AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
-AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
-AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
-AUX 1.2.0-zero-out-client-devprivates-on-allocation.patch 1284 RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 SHA1 0cfd5dcb57c42197e39e5469032833ea932c0b4f SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34
-AUX 1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7656 RMD160 2989af909eeec8c2e04126e5eaf34ac5f2b5449d SHA1 1dfe79a470b64f9981982216a3ec52e7b46dddff SHA256 09eeefa3b891fc7d860fff1dce485cc73278eee07a8494751b75df6fbdd66482
-AUX 1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 622 RMD160 e3d8a3f8ad55bf4c9da7736019255d00ecd07836 SHA1 3da82b9a81995b31ad84ccb376a619953837edb5 SHA256 ca0a6dca401ac9dd17d87866dc0d70ca02d8f9a18cfeafe7998af56b75148162
-AUX 1.3-alpha-build-fix.patch 1151 RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c SHA1 210ef43db8ad8080db21a86c31f7744dbdb7e439 SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186
-AUX 1.3.0.0-fix-dual-head-screen-resolutions.patch 1542 RMD160 b09e29247cc11e94a028596bebd9ee8237cbb490 SHA1 eb416bed3c6eb8323a6305ca0576ca94b667205f SHA256 c944c684fe6cfb115f1c4ce1fb5b291ca82d6f44ce9a5381d711414c72c1ed70
-AUX 1.3.0.0-fix-randr-resizing.patch 1986 RMD160 7fe971a41e5659876596b921d33d316c7a22f6fa SHA1 6f8c41b3f25dbb58a050929d6af03778d0b15c26 SHA256 f9a489027004c9e62a76b431344a6f5936989b8161dc5a51018070e3d59e015e
-AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 RMD160 03595cb965623383f8429560c551e13f882bf1b9 SHA1 693e64678100480135c3853590481b20342e9eae SHA256 32cd35d353ba2568d98125328574a0d2c021637a367dd3de616e02a2f8fdd4b9
-AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 RMD160 6fcee07ea40289b40c43bce5bee88b282ae536f4 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
-AUX 1.3.0.0-ramdac.patch 2736 RMD160 6a57be8c314989c110f1dd82563fa730512b6a5f SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
-AUX 1.3.0.0-use-proc-instead-of-sys.patch 686 RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb SHA1 44112c3643d026f318850f2b763f3ca3952bb686 SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54
-AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
-AUX 1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch 980 RMD160 0e7739e5aa846db9485a2e9c1a19a9b43770995a SHA1 5ffb6b3bcf5e40d3d51c466bf2c077673341793d SHA256 d8f41a4df64818fdc97db3f194e2fece32915f04b824efb96f577cdf31372a64
-AUX 1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch 747 RMD160 3e9c54bd0ca801a94540c069a09896538d79697e SHA1 894bce69645b8353e0386b26f594e0e3ccda7c9c SHA256 4fec6a5b20c35ac7a8a34bf9851fc760bedc27e3e83b9de57f0ac6b3c2766e9e
-AUX 1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7342 RMD160 cecc6e6cf0dfbdc1aa74149a7df307961fe77250 SHA1 e24460f9477072716083e6483deda46c0034ad8c SHA256 81538f7c1ebb3e002a5777e91aeff4befa51b5e659fcd91c9f23c68d62121336
-AUX 1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch 6830 RMD160 d5573b0af87a1b4fbea7e63fb1a161bfa56b1103 SHA1 8634b48c7a655a3ccd61fda78deaa54090c82ce3 SHA256 7f38a704931f515a68a460abccfd0fed15d51915cbef9f8ed9d1e0ccdd2cf14d
-AUX 1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch 912 RMD160 c931db35d87a94a89db7fdfd9826565b94b8803f SHA1 e258c3f9c03fc92473daf8ae18ee0d0fa47e26ac SHA256 39ec99f6643b73951a5a5ed14c54c227885b7411da76ecec3c923fd8189c6364
-AUX 1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 870 RMD160 adbc9a110c0e7aef884f5ea9c61148688ac441e5 SHA1 a9c8e1bb513073304d465ad0079c1dd452d053d6 SHA256 d1545329c64f492acc9935df68b31d513d3f1ddcfc5f821224a33761cf4b5c81
-AUX 1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch 2594 RMD160 0197f2ef4e2734e3f82d94fb9aefd6b77b287c8a SHA1 d2d3666ac30bc5b541b8bf30fe5de157dbb79c9a SHA256 69c8eb09cbf978bbdaef1ae9537778bcf40c7c67bbfeab0b5753e5538147a4ce
-AUX 1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch 1332 RMD160 0dc6a97eb653306d4f454707f274644d8564fbf2 SHA1 295bd873f26d01094b458449a99ffa708b5cc45d SHA256 f6c5949c3843f2cda8eb19ec2cd252ee53a3868ab0bc886272b5e95db81d39c2
-AUX 1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch 1353 RMD160 31bc8d452d1959f80580555489007fcc77d8780b SHA1 1a1c33a8097e301623d6ec7abebb23b3ac87c570 SHA256 2641e629e83cfa536cc7e765fdcc79bae217deddf892349bbde17a4fb6c76059
-AUX 1.4-document-new-font-catalogs.patch 4540 RMD160 92e450666e840fefb8604dc664ce0276e01c28d7 SHA1 6bf78fde99494b047658836adfa35b5d75224214 SHA256 8a73f0a01235c6cb1acefa09a726f68089fc10c1d68ffdf2e1b57091caafbbfd
-AUX 1.4-dont-hang-openoffice.patch 2235 RMD160 cc208574ad07d806f71fc6be79796594601c0894 SHA1 f82487057211b699bdca0874f5ec9bbec9ccdf40 SHA256 bbd05d1ff0e7f97b7ec11c7ebdd32cdcf8984b69d1dc87b46cc66133895e2644
-AUX 1.4-fix-dmx-build.patch 509 RMD160 699daf15f9ff4878a1583acaf5bc7c01afb5904c SHA1 0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf SHA256 4a01681656d09780dd15696804ce8210a4a5324bf63c33a7692e8971fbeb1843
-AUX 1.4-fix-dmx-link.patch 363 RMD160 429ce2827b9a5047ea7ad5ca4ec93740e85099af SHA1 41f686ef462e179f6c7e73a1babb7c0f2312d337 SHA256 50fbbe7391a354de2fa321944b921193e1097eaed4d775e343687f4a1a33a002
 AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
-AUX 1.4-fix-xephyr-link.patch 850 RMD160 574c9e4b38ceaf5964bfcd9020842b027f22cac1 SHA1 352c55be4b91b29c84b192d806a90834d887fc22 SHA256 89761f041d694db9891a5a72ff0ee1066d08c2d19a5cec448482fb2b427d2c10
-AUX 1.4-fix-xprint-build.patch 413 RMD160 79275b83b2a41bd4a7488011a9d2b93d6ec0400f SHA1 e2611665d555d5dc93ede0ab4beb9acb16b6b5aa SHA256 183a6c7d6f506dcd637a10057421811901035ed802c27cdd6bc6869924337d40
-AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c6 SHA1 67f057700577562b6260d07a8e82ab2dad117a4c SHA256 f6f7a67c93dce63a6f16ccb2182fbd861c7627d071225251df4a733412eda7f0
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
-AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
-AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
-AUX 1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch 718 RMD160 04839af0a778bdc02090f04d906f498fc31504e9 SHA1 d8bdfdd36f4b69af6990e69947aa8d503f43b454 SHA256 58f511d956dcd801236f548bfe02162379a50698939fead338e4029aabdef30d
-AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
-AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
-AUX 1.5.3-builtin-fonts.patch 646 RMD160 29bf7a3ba112621f9d8e645c0c9129caee318735 SHA1 f1cf5a1b525e4165c57271d11edf10087b2aeb7e SHA256 614c214118be05452cb81b8959a372961a6a8e4474cb69bcee50614cc04e1f9d
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
-AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
-AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
-AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 RMD160 06d03313a419fcad6b3668888e32dad28defb3a4 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
-AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
-AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
-AUX xorg-xserver-1.4-cve-2008-1377.diff 2907 RMD160 c9ae132d9eb74d071cc18c7fdb972f72882d49c2 SHA1 2b75985081665b8d646b5810d411047c6c150576 SHA256 d901af6ab2884f9c5070a1e8d84bdf79d253356bc634dd3385341c363003b680
-AUX xorg-xserver-1.4-cve-2008-1379.diff 754 RMD160 3d01b0aa29c96d31e8a8b41696bb9520b78d2e96 SHA1 1ca8b8417d805e0c233bda4b980cb168ec444abd SHA256 e21678777b4db84fc160ad69c1b5dcde357a4be2f978e120d0e46ac8bc03c97c
-AUX xorg-xserver-1.4-cve-2008-2360.diff 976 RMD160 016ef54e20583e62ed6c30e9400c378ead79ec25 SHA1 2e8532fe737e702cb18160705cd75daed4141a4c SHA256 a7e14cd8543760a39b92af181a6014762b2c8fa9afbabbcc7bd1b08478a8e2b3
-AUX xorg-xserver-1.4-cve-2008-2361.diff 463 RMD160 1ff48c39ac741e4dd18ad548bb7c987c149bf147 SHA1 950af2461d0bc5ff5b2b3cc40d517344a77e19f9 SHA256 7766be01619dd3d2e7794ef87460caa88093283e058b051eab0a66d90f3c5300
-AUX xorg-xserver-1.4-cve-2008-2362.diff 2259 RMD160 f5bc9bfd1b01821553b35f22ea2aedb3bbdd275a SHA1 e773f720057785062958d0fa9f29a4cb441883c8 SHA256 051001768f5ecbe9d65cdae53318bcf84a7de6a4c814a53c3a61ae2b427bed3d
-AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
-DIST xorg-server-1.6.3.tar.bz2 4651487 RMD160 5b9ddfeb9fb7082ef600e368ada8abbb006fe418 SHA1 1f28e8723e110e5c1a1adf3bc89325a81a526184 SHA256 7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
 EBUILD xorg-server-1.5.3-r6.ebuild 15760 RMD160 82e5a893c835ef0b3b9cad8e20cd2f388a4cfa75 SHA1 f0b3fc71cf84b5868756f4240c9e323be1d65010 SHA256 2e1c52b41126b59c5de2e806a2fde726fb7d673956c628af51b47b6841002de8
 EBUILD xorg-server-1.5.3-r7.ebuild 15862 RMD160 90ff9fcc140d8578531418669607bdb042af144b SHA1 44d104f7b8f415eb50505ff83c292a087ef34caf SHA256 7762b1b300f0648c479d1e265e9431052a081d641d32ab3541e9e8b44d2498d8
-EBUILD xorg-server-1.6.3.901-r1.ebuild 7086 RMD160 c6ddb229b31c5db28fce1b9af3668ee37c0b5491 SHA1 db1e058bdad49bcd49ebad49784a2951b21dd6fa SHA256 6694f4151536a62df0060e4ba6a7cba16218aa60d602257c7d16453abcc117b0
 EBUILD xorg-server-1.6.3.901-r2.ebuild 7096 RMD160 d27a89d9416094d9d57ea0e5f65a3910c458e5ca SHA1 0686c1cd2f088779c6ba871a27a5e99c8f6f4dc7 SHA256 6d40d5ccd638569383854233f0d564d904c28468aace544fb3c2cd1d013807d3
-EBUILD xorg-server-1.6.3.901.ebuild 12784 RMD160 22f11ea05d5da259c9d11b842780e11ea1799692 SHA1 a3c4c9b1f478eddd4498e8aecfba1db28260c989 SHA256 86bfd572fb3c4956a4db71681c8d8aceed340a55ef4ede217fffa33cea6eb06c
-EBUILD xorg-server-1.6.3.ebuild 12812 RMD160 fcae061f498feb043107350d3fd22e9c5e66aec6 SHA1 c86c5e3334573234e779cfda850c80d80d8b13f7 SHA256 eac04208643edae469630d04641d516746d1a8f9edf3e192c113b6e4e0fe5caa
-MISC ChangeLog 101425 RMD160 03049190a5de4426bf696ce251ae18cfc55dd596 SHA1 60fc630a970b6bf51c551ca977c503682bc6fb6d SHA256 6ed67eb0c974977ad8a77aded47c6bcc973a2bad9927bf7dc279234ca74f1140
+MISC ChangeLog 104046 RMD160 a30782b88fb65bd99c31b7e68523d515a1fe38c7 SHA1 3fe204807c3841f488c9d74b27e26efaa6e61343 SHA256 dce5b0791776126cc3dffa132cd9e3d413c3a3b5464141bbce463796630a4054
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
deleted file mode 100644
index 48775d336e05..000000000000
--- a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=876b806ec09d5ff0c6cd19df91006c4eefedfaa6
-Reapply patch to fix AMD CPU detection
-	author  Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
-	Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
-	committer  Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
-	Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
-	commit  876b806ec09d5ff0c6cd19df91006c4eefedfaa6
-	tree  0c30b71f2adbbea5641bc4611c6360e23a2e172d  tree
-	parent  13568d2aa43da4216bbcb46e1125ff28c323ac54  commit | commitdiff
-Reapply patch to fix AMD CPU detection
-
---- xorg-server-1.2.0.orig/fb/fbpict.c	2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/fb/fbpict.c	2007-03-19 00:30:44.000000000 +0100
-@@ -1470,21 +1470,23 @@
-     if (result) {
-         /* result now contains the standard feature bits */
-         if (result & (1 << 15))
-             features |= CMOV;
-         if (result & (1 << 23))
-             features |= MMX;
-         if (result & (1 << 25))
-             features |= SSE;
-         if (result & (1 << 26))
-             features |= SSE2;
--        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
-+        if ((features & MMX) && !(features & SSE) &&
-+            (strcmp(vendor, "AuthenticAMD") == 0 ||
-+             strcmp(vendor, "Geode by NSC") == 0)) {
-             /* check for AMD MMX extensions */
- 
-             unsigned int result;            
-             __asm__("push %%ebx\n"
-                     "mov $0x80000000, %%eax\n"
-                     "cpuid\n"
-                     "xor %%edx, %%edx\n"
-                     "cmp $0x1, %%eax\n"
-                     "jge 2\n"
-                     "mov $0x80000001, %%eax\n"
diff --git a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
deleted file mode 100644
index b4747c481460..000000000000
--- a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=b5fde366e2e21234ac0b81222fd5c42ca3e49cba
-Properly free device devPrivates - memory leak fix.
-	author  Eamon Walsh <ewalsh@tycho.nsa.gov>
-	Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
-	committer  Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
-	Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
-	commit  b5fde366e2e21234ac0b81222fd5c42ca3e49cba
-	tree  21c4d64fc97f8a7b0ec39f7e7a408540dd78691e  tree
-	parent  a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac  commit | commitdiff
-Properly free device devPrivates - memory leak fix.
-
---- xorg-server-1.2.0.orig/dix/devices.c	2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/dix/devices.c	2007-03-18 21:47:58.000000000 +0100
-@@ -268,20 +268,24 @@
- 	if (l->xkb_sli)
- 	    XkbFreeSrvLedInfo(l->xkb_sli);
- #endif
- 	xfree(l);
-     }
- #ifdef XKB
-     while (dev->xkb_interest) {
- 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
-     }
- #endif
-+
-+    if (dev->devPrivates)
-+        xfree(dev->devPrivates);
-+
-     xfree(dev->sync.event);
-     xfree(dev);
- }
- 
- void
- CloseDownDevices()
- {
-     register DeviceIntPtr dev, next;
- 
-     for (dev = inputInfo.devices; dev; dev = next)
diff --git a/x11-base/xorg-server/files/1.2.0-typo-fix.patch b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
deleted file mode 100644
index 0a152171d743..000000000000
--- a/x11-base/xorg-server/files/1.2.0-typo-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=a23b0b069cac8a48e2b306b2095515d75f647705
-Typo fix.
-	author  Adam Jackson <ajax@benzedrine.nwnk.net>
-	Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
-	committer  Adam Jackson <ajax@benzedrine.nwnk.net>
-	Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
-	commit  a23b0b069cac8a48e2b306b2095515d75f647705
-	tree  44d98fa9da8b879e4d610a9fc484804a418d217c  tree
-	parent  d21c95f80bdba2f29eedd57fb0b00e580391c08e  commit | commitdiff
-Typo fix.
-
---- xorg-server-1.2.0.orig/hw/xfree86/os-support/xf86_libc.h	2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h	2007-03-19 00:31:52.000000000 +0100
-@@ -421,21 +421,21 @@
- #undef tan
- #define tan(d)			xf86tan(d)
- #undef tmpfile
- #define tmpfile()		xf86tmpfile()
- #undef tolower
- #define tolower(i)		xf86tolower(i)
- #undef toupper
- #define toupper(i)		xf86toupper(i)
- #undef ungetc
- #define ungetc(i,FP)		xf86ungetc(i,FP)
--#undef vfprinf
-+#undef vfprintf
- #define vfprintf(p,f,a)		xf86vfprintf(p,f,a)
- #undef vsnprintf
- #define vsnprintf(s,n,f,a)	xf86vsnprintf(s,n,f,a)
- #undef vsprintf
- #define vsprintf(s,f,a)		xf86vsprintf(s,f,a)
- /* XXX Disable assert as if NDEBUG was defined */
- /* Some X headers defined this away too */
- #undef assert
- #define assert(a)		((void)0)
- #undef HUGE_VAL
-\ No newline at end of file
diff --git a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
deleted file mode 100644
index 7c6144b549b4..000000000000
--- a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=d9e079d2a385203fdd18d958cfc19d759cab4ba8
-Zero out client devPrivates on allocation.
-	author  Eamon Walsh <ewalsh@tycho.nsa.gov>
-	Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
-	committer  Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
-	Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
-	commit  d9e079d2a385203fdd18d958cfc19d759cab4ba8
-	tree  20548a2b4ab268c5a32c5883f3d06816c9f5d43e  tree
-	parent  e437f357b6850a6c87ca6696870b3abd40e5b8ed  commit | commitdiff
-Zero out client devPrivates on allocation.
-
---- xorg-server-1.2.0.orig/dix/dispatch.c	2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/dix/dispatch.c	2007-03-18 22:00:24.000000000 +0100
-@@ -3683,20 +3683,22 @@
- 	ppriv = (DevUnion *)(client + 1);
-     else
-     {
- 	ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec));
- 	if (!ppriv)
- 	    return 0;
-     }
-     client->devPrivates = ppriv;
-     sizes = clientPrivateSizes;
-     ptr = (char *)(ppriv + clientPrivateLen);
-+    if (ppriv)
-+        bzero(ppriv, totalClientSize - sizeof(ClientRec));
-     for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++)
-     {
- 	if ( (size = *sizes) )
- 	{
- 	    ppriv->ptr = (pointer)ptr;
- 	    ptr += size;
- 	}
- 	else
- 	    ppriv->ptr = (pointer)NULL;
-     }
diff --git a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
deleted file mode 100644
index 18075a656dc1..000000000000
--- a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-Index: xorg-server-1.3.0.0/Xi/chgfctl.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgfctl.c
-+++ xorg-server-1.3.0.0/Xi/chgfctl.c
-@@ -451,18 +451,13 @@ ChangeStringFeedback(ClientPtr client, D
- 		     xStringFeedbackCtl * f)
- {
-     register char n;
--    register long *p;
-     int i, j;
-     KeySym *syms, *sup_syms;
- 
-     syms = (KeySym *) (f + 1);
-     if (client->swapped) {
- 	swaps(&f->length, n);	/* swapped num_keysyms in calling proc */
--	p = (long *)(syms);
--	for (i = 0; i < f->num_keysyms; i++) {
--	    swapl(p, n);
--	    p++;
--	}
-+	SwapLongs((CARD32 *) syms, f->num_keysyms);
-     }
- 
-     if (f->num_keysyms > s->ctrl.max_symbols) {
-Index: xorg-server-1.3.0.0/Xi/chgkmap.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgkmap.c
-+++ xorg-server-1.3.0.0/Xi/chgkmap.c
-@@ -79,18 +79,14 @@ int
- SProcXChangeDeviceKeyMapping(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i, count;
-+    register unsigned int count;
- 
-     REQUEST(xChangeDeviceKeyMappingReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
--    p = (long *)&stuff[1];
-     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
--    for (i = 0; i < count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), count);
-     return (ProcXChangeDeviceKeyMapping(client));
- }
- 
-@@ -106,10 +102,14 @@ ProcXChangeDeviceKeyMapping(register Cli
-     int ret;
-     unsigned len;
-     DeviceIntPtr dev;
-+    unsigned int count;
- 
-     REQUEST(xChangeDeviceKeyMappingReq);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
- 
-+    count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+
-     dev = LookupDeviceIntRec(stuff->deviceid);
-     if (dev == NULL) {
- 	SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
-Index: xorg-server-1.3.0.0/Xi/chgprop.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgprop.c
-+++ xorg-server-1.3.0.0/Xi/chgprop.c
-@@ -81,19 +81,15 @@ int
- SProcXChangeDeviceDontPropagateList(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i;
- 
-     REQUEST(xChangeDeviceDontPropagateListReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
-     swapl(&stuff->window, n);
-     swaps(&stuff->count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
-+                      stuff->count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-     return (ProcXChangeDeviceDontPropagateList(client));
- }
- 
-Index: xorg-server-1.3.0.0/Xi/grabdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdev.c
-+++ xorg-server-1.3.0.0/Xi/grabdev.c
-@@ -82,8 +82,6 @@ int
- SProcXGrabDevice(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i;
- 
-     REQUEST(xGrabDeviceReq);
-     swaps(&stuff->length, n);
-@@ -91,11 +89,11 @@ SProcXGrabDevice(register ClientPtr clie
-     swapl(&stuff->grabWindow, n);
-     swapl(&stuff->time, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+
-+    if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
-+       return BadLength;
-+    
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- 
-     return (ProcXGrabDevice(client));
- }
-Index: xorg-server-1.3.0.0/Xi/grabdevb.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdevb.c
-+++ xorg-server-1.3.0.0/Xi/grabdevb.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceButton(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i;
- 
-     REQUEST(xGrabDeviceButtonReq);
-     swaps(&stuff->length, n);
-@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(register ClientPt
-     swapl(&stuff->grabWindow, n);
-     swaps(&stuff->modifiers, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
-+                      stuff->event_count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- 
-     return (ProcXGrabDeviceButton(client));
- }
-Index: xorg-server-1.3.0.0/Xi/grabdevk.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdevk.c
-+++ xorg-server-1.3.0.0/Xi/grabdevk.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceKey(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i;
- 
-     REQUEST(xGrabDeviceKeyReq);
-     swaps(&stuff->length, n);
-@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(register ClientPtr c
-     swapl(&stuff->grabWindow, n);
-     swaps(&stuff->modifiers, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-     return (ProcXGrabDeviceKey(client));
- }
- 
-Index: xorg-server-1.3.0.0/Xi/selectev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/selectev.c
-+++ xorg-server-1.3.0.0/Xi/selectev.c
-@@ -84,19 +84,16 @@ int
- SProcXSelectExtensionEvent(register ClientPtr client)
- {
-     register char n;
--    register long *p;
--    register int i;
- 
-     REQUEST(xSelectExtensionEventReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
-     swapl(&stuff->window, n);
-     swaps(&stuff->count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
-+                      stuff->count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-+
-     return (ProcXSelectExtensionEvent(client));
- }
- 
-Index: xorg-server-1.3.0.0/Xi/sendexev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/sendexev.c
-+++ xorg-server-1.3.0.0/Xi/sendexev.c
-@@ -83,7 +83,7 @@ int
- SProcXSendExtensionEvent(register ClientPtr client)
- {
-     register char n;
--    register long *p;
-+    register CARD32 *p;
-     register int i;
-     xEvent eventT;
-     xEvent *eventP;
-@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(register Client
-     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
-     swapl(&stuff->destination, n);
-     swaps(&stuff->count, n);
-+
-+    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
-+       (stuff->num_events * (sizeof(xEvent) >> 2)))
-+       return BadLength;
-+
-     eventP = (xEvent *) & stuff[1];
-     for (i = 0; i < stuff->num_events; i++, eventP++) {
- 	proc = EventSwapVector[eventP->u.u.type & 0177];
-@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(register Client
- 	*eventP = eventT;
-     }
- 
--    p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
-+    SwapLongs(p, stuff->count);
-     return (ProcXSendExtensionEvent(client));
- }
- 
diff --git a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
deleted file mode 100644
index b8e5178db786..000000000000
--- a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server-1.3.0.0/Xext/security.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xext/security.c
-+++ xorg-server-1.3.0.0/Xext/security.c
-@@ -1567,7 +1567,7 @@ SecurityLoadPropertyAccessList(void)
- 	return;
- 
- #ifndef __UNIXOS2__
--    f = fopen(SecurityPolicyFile, "r");
-+    f = Fopen(SecurityPolicyFile, "r");
- #else
-     f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
- #endif    
-@@ -1653,7 +1653,7 @@ SecurityLoadPropertyAccessList(void)
-     }
- #endif /* PROPDEBUG */
- 
--    fclose(f);
-+    Fclose(f);
- } /* SecurityLoadPropertyAccessList */
- 
- 
diff --git a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
deleted file mode 100644
index 481e4ad68011..000000000000
--- a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Thu Jul 19 20:37:26 2007 -0400
-
-    Fix alpha build failures
-    
-    Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
-    <unistd.h> instead
-
-diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
-index 5aca9e9..085c942 100644
---- a/hw/xfree86/os-support/linux/lnx.h
-+++ b/hw/xfree86/os-support/linux/lnx.h
-@@ -11,7 +11,6 @@ extern int iopl __P ((int __level));
- 
- /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
- #  include <linux/unistd.h>
--#  include <asm/pci.h>
- extern long (*_iobase)(unsigned, int, int, int);
- 
- /*
-diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
-index 0a76129..e255118 100644
---- a/hw/xfree86/os-support/linux/lnx_axp.c
-+++ b/hw/xfree86/os-support/linux/lnx_axp.c
-@@ -112,8 +112,8 @@ lnxGetAXP(void)
- /*
-  * pciconfig_iobase wrappers and dynamic i/o selection
-  */
--#include <linux/unistd.h>
--#include <asm/pci.h>
-+#include "lnx.h"
-+#include <unistd.h>
- #include <errno.h>
- 
- /* glibc versions (single hose only) */
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
deleted file mode 100644
index c5b957147778..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Title       : x11-base/xorg-server-1.3.0.0 uses wrong screen resolutions on a dual-head systems
-Assignee    : x11@gentoo.org
-Reported    : 2007-05-23 16:53 0000
-Updated     : 2007-10-02 19:39:28 0000
-Status      : NEW
-Severity    : normal
-Priority    : P2
-Reporter    : jouni.rinne@pp1.inet.fi
-Product     : Gentoo Linux
-Component   : Server
-Keywords    : Inclusion
-CC          : bas@lijer.nl
-CC          : daniel.pielmeier@googlemail.com
-CC          : frlinux@frlinux.net
-CC          : ml81@gmx.de
-Comments    : 14
-Attachments : 1
-URL         : http://bugs.gentoo.org/show_bug.cgi?id=179545
-
-commit 9c80eda826448822328bb678a7d284cc43fffb17
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date:   Wed Apr 25 16:35:04 2007 -0400
-
-    Disable RANDR's fake Xinerama protocol when there's more than one screen.
-
-    ... in the protocol sense.  Xinerama doesn't have any provision for more
-    than one protocol screen each with its own geometry.
-
-    Red Hat bug #231257.
-
-diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
-index 1db27f1..2a57e4e 100644
---- a/randr/rrxinerama.c
-+++ b/randr/rrxinerama.c
-@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void)
- 	return;
- #endif
- 
-+    /*
-+     * Xinerama isn't capable enough to have multiple protocol screens each
-+     * with their own output geometry.  So if there's more than one protocol
-+     * screen, just don't even try.
-+     */
-+    if (screenInfo.numScreens > 1)
-+	return;
-+
-     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
- 			ProcRRXineramaDispatch,
- 			SProcRRXineramaDispatch,
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
deleted file mode 100644
index 48286996c72e..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Title       : xorg-server-1.3: desktop does not resize with RandR
-Assignee    : x11@gentoo.org
-Reported    : 2007-06-30 11:37 0000
-Updated     : 2007-10-06 08:32:58 0000
-Status      : ASSIGNED
-Severity    : normal
-Priority    : P2
-Reporter    : sascha.lucas@rus.uni-stuttgart.de
-Product     : Gentoo Linux
-Component   : KDE
-Keywords    : Inclusion
-CC          : caster@gentoo.org
-CC          : chrschmitt@gmail.com
-CC          : gentoo@chlhp.de
-CC          : kde@gentoo.org
-Comments    : 14
-Attachments : 0
-URL         : http://bugs.gentoo.org/show_bug.cgi?id=183721
-
-commit c10df5b967d4da4e11786520317e2917de5541fa
-Author: Aaron Plattner <aplattner@nvidia.com>
-Date:   Tue Apr 3 15:47:01 2007 -0700
-
-    Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
-
-    RandR 1.1 clients expect the size fields in this event to be the unrotated
-    dimensions of the screen.  This behavior is "weird", but that's the way the old
-    code worked so we need to be bug-compatible with it.
-
-diff --git a/randr/rrscreen.c b/randr/rrscreen.c
-index ad74ac3..f83fce3 100644
---- a/randr/rrscreen.c
-+++ b/randr/rrscreen.c
-@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
- 
-     se.sequenceNumber = client->sequence;
-     se.sizeID = RR10CurrentSizeID (pScreen);
--    
--    se.widthInPixels = pScreen->width;
--    se.heightInPixels = pScreen->height;
--    se.widthInMillimeters = pScreen->mmWidth;
--    se.heightInMillimeters = pScreen->mmHeight;
-+
-+    if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-+	se.widthInPixels = pScreen->height;
-+	se.heightInPixels = pScreen->width;
-+	se.widthInMillimeters = pScreen->mmHeight;
-+	se.heightInMillimeters = pScreen->mmWidth;
-+    } else {
-+	se.widthInPixels = pScreen->width;
-+	se.heightInPixels = pScreen->height;
-+	se.widthInMillimeters = pScreen->mmWidth;
-+	se.heightInMillimeters = pScreen->mmHeight;
-+    }
-+
-     WriteEventsToClient (client, 1, (xEvent *) &se);
- }
- 
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
deleted file mode 100644
index c8fdfedb3cf9..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Title       : x11-base/xorg-server-1.3.0.0 Xephyr segfaults on startup on amd64
-Assignee    : x11@gentoo.org
-Reported    : 2007-09-20 17:22 0000
-Updated     : 2007-09-20 17:52:21 0000
-Status      : NEW
-URL         : https://bugs.freedesktop.org/show_bug.cgi?id=11582
-Severity    : normal
-Priority    : P2
-Reporter    : chithanh@cs.tu-berlin.de
-Product     : Gentoo Linux
-Component   : Server
-Keywords    : Inclusion
-Comments    : 2
-Attachments : 1
-URL         : http://bugs.gentoo.org/show_bug.cgi?id=193207
-
-commit dcc3de91d2b80be98e4488df29ec6b551c7ff6d1
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Sat Aug 18 11:50:33 2007 +0200
-
-    Xephyr: fix immediat segfault on amd64
-
-    This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582
-
-diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
-index d0a2f2f..12118da 100644
---- a/hw/kdrive/ephyr/hostx.c
-+++ b/hw/kdrive/ephyr/hostx.c
-@@ -40,6 +40,7 @@
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
- #include <X11/extensions/XShm.h>
-+#include <X11/Xmd.h>
- 
- /*  
-  * All xlib calls go here, which gets built as its own .a .
-@@ -79,7 +80,7 @@ static int            HostXWantDamageDebug = 0;
- 
- extern KeySym         EphyrKeymap[];
- 
--extern KeySym	      kdKeymap[];
-+extern CARD32	      kdKeymap[];
- extern int	      kdMinScanCode;
- extern int	      kdMaxScanCode;
- extern int	      kdMinKeyCode;
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
deleted file mode 100644
index 88df93b5bc57..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=197104
-
-commit a5b8053606d6e786cdcf6734f271acc05f9cc588
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date:   Tue Sep 11 11:37:06 2007 -0400
-
-    Ignore - not just block - SIGALRM around Popen()/Pclose().
-
-    Because our "popen" implementation uses stdio, and because nobody's stdio
-    library is capable of surviving signals, we need to make absolutely sure
-    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
-    open a menu in openoffice, and it recompiles XKB to deal with the
-    accelerators, and you popen xkbcomp because we suck, then the scheduler
-    will tell you you're taking forever doing something stupid, and the
-    wait() code will get confused, and input will hang and your CPU usage
-    slams to 100%.  Down, not across.
-
-diff --git a/os/utils.c b/os/utils.c
-index 3bb7dbe..afcaae4 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1720,6 +1720,8 @@ static struct pid {
-     int pid;
- } *pidlist;
- 
-+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
-+
- pointer
- Popen(char *command, char *type)
- {
-@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
- 	return NULL;
-     }
- 
-+    /* Ignore the smart scheduler while this is going on */
-+    old_alarm = signal(SIGALRM, SIG_IGN);
-+
-     switch (pid = fork()) {
-     case -1: 	/* error */
- 	close(pdes[0]);
- 	close(pdes[1]);
- 	xfree(cur);
-+	signal(SIGALRM, old_alarm);
- 	return NULL;
-     case 0:	/* child */
- 	if (setgid(getgid()) == -1)
-@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
-     /* allow EINTR again */
-     OsReleaseSignals ();
-     
-+    signal(SIGALRM, old_alarm);
-+
-     return pid == -1 ? -1 : pstat;
- }
- 
diff --git a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
deleted file mode 100644
index 37ab1b77c0a8..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Title       : xorg-server-1.3: xf86-video-s3 - s3_drv.so: undefined symbol: RamDacInit
-Assignee    : x11@gentoo.org
-Reported    : 2007-09-12 15:53 0000
-Updated     : 2007-10-06 08:34:19 0000
-Status      : NEW
-Severity    : normal
-Priority    : P2
-Reporter    : dpblnt@gmail.com
-Product     : Gentoo Linux
-Component   : Applications
-Keywords    : Inclusion
-Comments    : 3
-Attachments : 1
-URL         : http://bugs.gentoo.org/show_bug.cgi?id=192312
-
-commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Tue May 29 22:01:30 2007 -0400
-
-    Make sure that the ramdac symbols are present in the server
-    
-    The former ramdac module is now built into the server, so its symbols need to
-    be explicitly exported to drivers (Debian #423129).
-
-diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
-index 5175f01..6535e4c 100644
---- a/hw/xfree86/loader/xf86sym.c
-+++ b/hw/xfree86/loader/xf86sym.c
-@@ -96,6 +96,11 @@
- #endif
- #include "xf86DDC.h"
- #include "edid.h"
-+#include "xf86Cursor.h"
-+#include "xf86RamDac.h"
-+#include "BT.h"
-+#include "IBM.h"
-+#include "TI.h"
- 
- #ifndef HAS_GLIBC_SIGSETJMP
- #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
-@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
-     SYMFUNC(xf86I2CWriteRead)
-     SYMFUNC(xf86I2CWriteVec)
-     SYMFUNC(xf86I2CWriteWord)
-+
-+    /* ramdac/xf86RamDac.c */
-+    SYMFUNC(RamDacCreateInfoRec)
-+    SYMFUNC(RamDacHelperCreateInfoRec)
-+    SYMFUNC(RamDacDestroyInfoRec)
-+    SYMFUNC(RamDacHelperDestroyInfoRec)
-+    SYMFUNC(RamDacInit)
-+    SYMFUNC(RamDacHandleColormaps)
-+    SYMFUNC(RamDacFreeRec)
-+    SYMFUNC(RamDacGetHWIndex)
-+    SYMVAR(RamDacHWPrivateIndex)
-+    SYMVAR(RamDacScreenPrivateIndex)
-+
-+    /* ramdac/xf86Cursor.c */
-+    SYMFUNC(xf86InitCursor)
-+    SYMFUNC(xf86CreateCursorInfoRec)
-+    SYMFUNC(xf86DestroyCursorInfoRec)
-+    SYMFUNC(xf86ForceHWCursor)
-+
-+    /* ramdac/BT.c */
-+    SYMFUNC(BTramdacProbe)
-+    SYMFUNC(BTramdacSave)
-+    SYMFUNC(BTramdacRestore)
-+    SYMFUNC(BTramdacSetBpp)
-+
-+    /* ramdac/IBM.c */
-+    SYMFUNC(IBMramdacProbe)
-+    SYMFUNC(IBMramdacSave)
-+    SYMFUNC(IBMramdacRestore)
-+    SYMFUNC(IBMramdac526SetBpp)
-+    SYMFUNC(IBMramdac640SetBpp)
-+    SYMFUNC(IBMramdac526CalculateMNPCForClock)
-+    SYMFUNC(IBMramdac640CalculateMNPCForClock)
-+    SYMFUNC(IBMramdac526HWCursorInit)
-+    SYMFUNC(IBMramdac640HWCursorInit)
-+    SYMFUNC(IBMramdac526SetBppWeak)
-+
-+    /* ramdac/TI.c */
-+    SYMFUNC(TIramdacCalculateMNPForClock)
-+    SYMFUNC(TIramdacProbe)
-+    SYMFUNC(TIramdacSave)
-+    SYMFUNC(TIramdacRestore)
-+    SYMFUNC(TIramdac3026SetBpp)
-+    SYMFUNC(TIramdac3030SetBpp)
-+    SYMFUNC(TIramdacHWCursorInit)
-+    SYMFUNC(TIramdacLoadPalette)
- };
diff --git a/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
deleted file mode 100644
index 600d0babd9d9..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=167052 attachment #126176
-
-Fix multi-domain systems including sparc and pegasos ppc
-
-diff -Nura xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c
---- xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c	2006-11-16 15:01:25.000000000 -0300
-+++ xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c	2007-07-27 13:48:58.000000000 -0300
-@@ -148,7 +148,7 @@
- 	int		domain, bus, dev, func;
- 	char		file[64];
- 	struct stat	ignored;
--	static int is26 = -1;
-+	static int is26 = 0;
- 
- 	domain = PCI_DOM_FROM_TAG(tag);
- 	bus  = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
diff --git a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
deleted file mode 100644
index 4e5b1304c2d2..000000000000
--- a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
-- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
-  mess. (#231425)
-
-https://bugs.freedesktop.org/show_bug.cgi?id=10713
-http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log
-Debian bug #420421 (and maybe #424517)
-
---- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx	2007-03-07 14:15:25.000000000 -0500
-+++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c	2007-03-13 14:27:38.000000000 -0400
-@@ -281,12 +281,14 @@
-     __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
-     int i;
- 
--    for (i = 0; i < mesaScreen->num_vis; i++) {
--	if (mesaScreen->xm_vis[i])
--	    XMesaDestroyVisual(mesaScreen->xm_vis[i]);
--    }
-+    if (mesaScreen->xm_vis) {
-+	for (i = 0; i < mesaScreen->num_vis; i++) {
-+	    if (mesaScreen->xm_vis[i])
-+		XMesaDestroyVisual(mesaScreen->xm_vis[i]);
-+	}
- 
--    xfree(mesaScreen->xm_vis);
-+	xfree(mesaScreen->xm_vis);
-+    }
- 
-     __glXScreenDestroy(screen);
- 
diff --git a/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch b/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
deleted file mode 100644
index 54dead0ef7f4..000000000000
--- a/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 59a3b83922c810316a374a19484b24901c7437ae Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:26:41 +0100
-Subject: [PATCH] Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
-
----
- hw/xfree86/common/xf86MiscExt.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
-index c1b9c60..40c196a 100644
---- a/hw/xfree86/common/xf86MiscExt.c
-+++ b/hw/xfree86/common/xf86MiscExt.c
-@@ -548,6 +548,10 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval,
- {
-     ScrnInfoPtr pScr = xf86Screens[scrnIndex];
- 
-+    /* should check this in the protocol, but xf86NumScreens isn't exported */
-+    if (scrnIndex >= xf86NumScreens)
-+	return BadValue;
-+
-     if (*pScr->HandleMessage == NULL)
- 	    return BadImplementation;
-     return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch b/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
deleted file mode 100644
index a72ce3c3ce21..000000000000
--- a/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4848d49d05a318559afe7a17a19ba055947ee1f5 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:28:03 +0100
-Subject: [PATCH] Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
-
----
- Xext/cup.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/Xext/cup.c b/Xext/cup.c
-index 6bfa278..781b9ce 100644
---- a/Xext/cup.c
-+++ b/Xext/cup.c
-@@ -196,6 +196,9 @@ int ProcGetReservedColormapEntries(
- 
-     REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq);
- 
-+    if (stuff->screen >= screenInfo.numScreens)
-+	return BadValue;
-+
- #ifndef HAVE_SPECIAL_DESKTOP_COLORS
-     citems[CUP_BLACK_PIXEL].pixel = 
- 	screenInfo.screens[stuff->screen]->blackPixel;
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
deleted file mode 100644
index ffbf8ac4dff0..000000000000
--- a/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From d244c8272e0ac47c41a9416e37293903b842a78b Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:27:34 +0100
-Subject: [PATCH] Fix for CVE-2007-6427 - Xinput extension memory corruption.
-
----
- Xi/chgfctl.c  |    7 +------
- Xi/chgkmap.c  |   13 ++++++-------
- Xi/chgprop.c  |   10 +++-------
- Xi/grabdev.c  |   12 +++++-------
- Xi/grabdevb.c |   10 +++-------
- Xi/grabdevk.c |    9 ++-------
- Xi/selectev.c |   11 ++++-------
- Xi/sendexev.c |   14 ++++++++------
- 8 files changed, 32 insertions(+), 54 deletions(-)
-
-diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
-index 2e0e13c..235d659 100644
---- a/Xi/chgfctl.c
-+++ b/Xi/chgfctl.c
-@@ -327,18 +327,13 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
- 		     xStringFeedbackCtl * f)
- {
-     char n;
--    long *p;
-     int i, j;
-     KeySym *syms, *sup_syms;
- 
-     syms = (KeySym *) (f + 1);
-     if (client->swapped) {
- 	swaps(&f->length, n);	/* swapped num_keysyms in calling proc */
--	p = (long *)(syms);
--	for (i = 0; i < f->num_keysyms; i++) {
--	    swapl(p, n);
--	    p++;
--	}
-+	SwapLongs((CARD32 *) syms, f->num_keysyms);
-     }
- 
-     if (f->num_keysyms > s->ctrl.max_symbols) {
-diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
-index eac520f..f8f85bc 100644
---- a/Xi/chgkmap.c
-+++ b/Xi/chgkmap.c
-@@ -79,18 +79,14 @@ int
- SProcXChangeDeviceKeyMapping(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i, count;
-+    unsigned int count;
- 
-     REQUEST(xChangeDeviceKeyMappingReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
--    p = (long *)&stuff[1];
-     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
--    for (i = 0; i < count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), count);
-     return (ProcXChangeDeviceKeyMapping(client));
- }
- 
-@@ -106,10 +102,13 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
-     int ret;
-     unsigned len;
-     DeviceIntPtr dev;
-+    unsigned int count;
- 
-     REQUEST(xChangeDeviceKeyMappingReq);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
- 
-+    count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-     dev = LookupDeviceIntRec(stuff->deviceid);
-     if (dev == NULL) {
- 	SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
-diff --git a/Xi/chgprop.c b/Xi/chgprop.c
-index 59a93c6..21bda5b 100644
---- a/Xi/chgprop.c
-+++ b/Xi/chgprop.c
-@@ -81,19 +81,15 @@ int
- SProcXChangeDeviceDontPropagateList(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i;
- 
-     REQUEST(xChangeDeviceDontPropagateListReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
-     swapl(&stuff->window, n);
-     swaps(&stuff->count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
-+                      stuff->count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-     return (ProcXChangeDeviceDontPropagateList(client));
- }
- 
-diff --git a/Xi/grabdev.c b/Xi/grabdev.c
-index e2809ef..d0b4ae7 100644
---- a/Xi/grabdev.c
-+++ b/Xi/grabdev.c
-@@ -82,8 +82,6 @@ int
- SProcXGrabDevice(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i;
- 
-     REQUEST(xGrabDeviceReq);
-     swaps(&stuff->length, n);
-@@ -91,11 +89,11 @@ SProcXGrabDevice(ClientPtr client)
-     swapl(&stuff->grabWindow, n);
-     swapl(&stuff->time, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+
-+    if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
-+       return BadLength;
-+    
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- 
-     return (ProcXGrabDevice(client));
- }
-diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
-index df62d0c..18db1f7 100644
---- a/Xi/grabdevb.c
-+++ b/Xi/grabdevb.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceButton(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i;
- 
-     REQUEST(xGrabDeviceButtonReq);
-     swaps(&stuff->length, n);
-@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(ClientPtr client)
-     swapl(&stuff->grabWindow, n);
-     swaps(&stuff->modifiers, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
-+                      stuff->event_count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- 
-     return (ProcXGrabDeviceButton(client));
- }
-diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
-index b74592f..429b2f7 100644
---- a/Xi/grabdevk.c
-+++ b/Xi/grabdevk.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceKey(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i;
- 
-     REQUEST(xGrabDeviceKeyReq);
-     swaps(&stuff->length, n);
-@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(ClientPtr client)
-     swapl(&stuff->grabWindow, n);
-     swaps(&stuff->modifiers, n);
-     swaps(&stuff->event_count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->event_count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-     return (ProcXGrabDeviceKey(client));
- }
- 
-diff --git a/Xi/selectev.c b/Xi/selectev.c
-index d52db1b..19415c5 100644
---- a/Xi/selectev.c
-+++ b/Xi/selectev.c
-@@ -131,19 +131,16 @@ int
- SProcXSelectExtensionEvent(ClientPtr client)
- {
-     char n;
--    long *p;
--    int i;
- 
-     REQUEST(xSelectExtensionEventReq);
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
-     swapl(&stuff->window, n);
-     swaps(&stuff->count, n);
--    p = (long *)&stuff[1];
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
-+                      stuff->count * sizeof(CARD32));
-+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-+
-     return (ProcXSelectExtensionEvent(client));
- }
- 
-diff --git a/Xi/sendexev.c b/Xi/sendexev.c
-index eac9abe..9803cf3 100644
---- a/Xi/sendexev.c
-+++ b/Xi/sendexev.c
-@@ -83,7 +83,7 @@ int
- SProcXSendExtensionEvent(ClientPtr client)
- {
-     char n;
--    long *p;
-+    CARD32 *p;
-     int i;
-     xEvent eventT;
-     xEvent *eventP;
-@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(ClientPtr client)
-     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
-     swapl(&stuff->destination, n);
-     swaps(&stuff->count, n);
-+
-+    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
-+       (stuff->num_events * (sizeof(xEvent) >> 2)))
-+       return BadLength;
-+
-     eventP = (xEvent *) & stuff[1];
-     for (i = 0; i < stuff->num_events; i++, eventP++) {
- 	proc = EventSwapVector[eventP->u.u.type & 0177];
-@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(ClientPtr client)
- 	*eventP = eventT;
-     }
- 
--    p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
--    for (i = 0; i < stuff->count; i++) {
--	swapl(p, n);
--	p++;
--    }
-+    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
-+    SwapLongs(p, stuff->count);
-     return (ProcXSendExtensionEvent(client));
- }
- 
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch b/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
deleted file mode 100644
index ac66b4de8f62..000000000000
--- a/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 8b14f7b74284900b95a319ec80c4333e63af2296 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:28:42 +0100
-Subject: [PATCH] Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
-
----
- Xext/EVI.c       |   15 ++++++++++++++-
- Xext/sampleEVI.c |   29 ++++++++++++++++++++++++-----
- Xext/shm.c       |   46 ++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 76 insertions(+), 14 deletions(-)
-
-diff --git a/Xext/EVI.c b/Xext/EVI.c
-index 8fe3481..13bd32a 100644
---- a/Xext/EVI.c
-+++ b/Xext/EVI.c
-@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/XEVIstr.h>
- #include "EVIstruct.h"
- #include "modinit.h"
-+#include "scrnintstr.h"
- 
- #if 0
- static unsigned char XEVIReqCode = 0;
-@@ -87,10 +88,22 @@ ProcEVIGetVisualInfo(ClientPtr client)
- {
-     REQUEST(xEVIGetVisualInfoReq);
-     xEVIGetVisualInfoReply rep;
--    int n, n_conflict, n_info, sz_info, sz_conflict;
-+    int i, n, n_conflict, n_info, sz_info, sz_conflict;
-     VisualID32 *conflict;
-+    unsigned int total_visuals = 0;
-     xExtendedVisualInfo *eviInfo;
-     int status;
-+
-+    /*
-+     * do this first, otherwise REQUEST_FIXED_SIZE can overflow.  we assume
-+     * here that you don't have more than 2^32 visuals over all your screens;
-+     * this seems like a safe assumption.
-+     */
-+    for (i = 0; i < screenInfo.numScreens; i++)
-+	total_visuals += screenInfo.screens[i]->numVisuals;
-+    if (stuff->n_visual > total_visuals)
-+	return BadValue;
-+
-     REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32);
-     status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual,
- 		&eviInfo, &n_info, &conflict, &n_conflict);
-diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
-index 7508aa7..b871bfd 100644
---- a/Xext/sampleEVI.c
-+++ b/Xext/sampleEVI.c
-@@ -34,6 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/XEVIstr.h>
- #include "EVIstruct.h"
- #include "scrnintstr.h"
-+
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- static int sampleGetVisualInfo(
-     VisualID32 *visual,
-     int n_visual,
-@@ -42,24 +49,36 @@ static int sampleGetVisualInfo(
-     VisualID32 **conflict_rn,
-     int *n_conflict_rn)
- {
--    int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
-+    unsigned int max_sz_evi;
-     VisualID32 *temp_conflict;
-     xExtendedVisualInfo *evi;
--    int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
-+    unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
-     register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
--    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
--    if (!*evi_rn)
--         return BadAlloc;
-+
-+    if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens))
-+	return BadAlloc;
-+    max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
-+    
-     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
-         if (screenInfo.screens[scrI]->numVisuals > max_visuals)
-             max_visuals = screenInfo.screens[scrI]->numVisuals;
-     }
-+
-+    if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens 
-+			       * max_visuals)) 
-+	return BadAlloc;
-     max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals;
-+
-+    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
-+    if (!*evi_rn)
-+         return BadAlloc;
-+
-     temp_conflict = (VisualID32 *)xalloc(max_sz_conflict);
-     if (!temp_conflict) {
-         xfree(*evi_rn);
-         return BadAlloc;
-     }
-+
-     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
-         for (visualI = 0; visualI < n_visual; visualI++) {
- 	    evi[sz_evi].core_visual_id = visual[visualI];
-diff --git a/Xext/shm.c b/Xext/shm.c
-index ac587be..5633be9 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -711,6 +711,8 @@ ProcPanoramiXShmCreatePixmap(
-     int i, j, result, rc;
-     ShmDescPtr shmdesc;
-     REQUEST(xShmCreatePixmapReq);
-+    unsigned int width, height, depth;
-+    unsigned long size;
-     PanoramiXRes *newPix;
- 
-     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
-@@ -724,11 +726,26 @@ ProcPanoramiXShmCreatePixmap(
- 	return rc;
- 
-     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
--    if (!stuff->width || !stuff->height)
-+
-+    width = stuff->width;
-+    height = stuff->height;
-+    depth = stuff->depth;
-+    if (!width || !height || !depth)
-     {
- 	client->errorValue = 0;
-         return BadValue;
-     }
-+    if (width > 32767 || height > 32767)
-+        return BadAlloc;
-+    size = PixmapBytePad(width, depth) * height;
-+    if (sizeof(size) == 4) {
-+        if (size < width * height)
-+            return BadAlloc;
-+        /* thankfully, offset is unsigned */
-+        if (stuff->offset + size < size)
-+            return BadAlloc;
-+    }
-+
-     if (stuff->depth != 1)
-     {
-         pDepth = pDraw->pScreen->allowedDepths;
-@@ -739,9 +756,7 @@ ProcPanoramiXShmCreatePixmap(
-         return BadValue;
-     }
- CreatePmap:
--    VERIFY_SHMSIZE(shmdesc, stuff->offset,
--		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
--		   client);
-+    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- 
-     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
- 	return BadAlloc;
-@@ -1040,6 +1055,8 @@ ProcShmCreatePixmap(client)
-     register int i, rc;
-     ShmDescPtr shmdesc;
-     REQUEST(xShmCreatePixmapReq);
-+    unsigned int width, height, depth;
-+    unsigned long size;
- 
-     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
-     client->errorValue = stuff->pid;
-@@ -1052,11 +1069,26 @@ ProcShmCreatePixmap(client)
- 	return rc;
- 
-     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
--    if (!stuff->width || !stuff->height)
-+    
-+    width = stuff->width;
-+    height = stuff->height;
-+    depth = stuff->depth;
-+    if (!width || !height || !depth)
-     {
- 	client->errorValue = 0;
-         return BadValue;
-     }
-+    if (width > 32767 || height > 32767)
-+	return BadAlloc;
-+    size = PixmapBytePad(width, depth) * height;
-+    if (sizeof(size) == 4) {
-+	if (size < width * height)
-+	    return BadAlloc;
-+	/* thankfully, offset is unsigned */
-+	if (stuff->offset + size < size)
-+	    return BadAlloc;
-+    }
-+
-     if (stuff->depth != 1)
-     {
-         pDepth = pDraw->pScreen->allowedDepths;
-@@ -1067,9 +1099,7 @@ ProcShmCreatePixmap(client)
-         return BadValue;
-     }
- CreatePmap:
--    VERIFY_SHMSIZE(shmdesc, stuff->offset,
--		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
--		   client);
-+    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
- 			    pDraw->pScreen, stuff->width,
- 			    stuff->height, stuff->depth,
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch b/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
deleted file mode 100644
index bb09eb8368f6..000000000000
--- a/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f09b8007e7f6e60e0b9c9665ec632b578ae08b6f Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:29:06 +0100
-Subject: [PATCH] Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
-
----
- dix/dixfonts.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index c21b3ec..7bb2404 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -325,6 +325,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
- 	err = BadFontName;
- 	goto bail;
-     }
-+    /* check values for firstCol, lastCol, firstRow, and lastRow */
-+    if (pfont->info.firstCol > pfont->info.lastCol ||
-+       pfont->info.firstRow > pfont->info.lastRow ||
-+       pfont->info.lastCol - pfont->info.firstCol > 255) {
-+       err = AllocError;
-+       goto bail;
-+    }
-     if (!pfont->fpe)
- 	pfont->fpe = fpe;
-     pfont->refcnt++;
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
deleted file mode 100644
index 61cc4da755d8..000000000000
--- a/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 17:03:39 +0100
-Subject: [PATCH] Fix for CVE-2007-5958 - File existence disclosure.
-
----
- Xext/security.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Xext/security.c b/Xext/security.c
-index ba057de..e9d48c9 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -1563,7 +1563,7 @@ SecurityLoadPropertyAccessList(void)
-     if (!SecurityPolicyFile)
- 	return;
- 
--    f = fopen(SecurityPolicyFile, "r");
-+    f = Fopen(SecurityPolicyFile, "r");
-     if (!f)
-     {
- 	ErrorF("error opening security policy file %s\n",
-@@ -1646,7 +1646,7 @@ SecurityLoadPropertyAccessList(void)
-     }
- #endif /* PROPDEBUG */
- 
--    fclose(f);
-+    Fclose(f);
- } /* SecurityLoadPropertyAccessList */
- 
- 
--- 
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch b/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
deleted file mode 100644
index 903f2be0efc9..000000000000
--- a/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From e9fa7c1c88a8130a48f772c92b186b8b777986b5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 18 Jan 2008 14:41:20 -0500
-Subject: [PATCH] CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
-
-Move size validation after depth validation, and only validate size if
-the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
-protected from overflow by the width and height checks.
----
- Xext/shm.c |   36 ++++++++++++++++++++----------------
- 1 files changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index c545e49..e46f6fc 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -783,14 +783,6 @@ ProcPanoramiXShmCreatePixmap(
-     }
-     if (width > 32767 || height > 32767)
-         return BadAlloc;
--    size = PixmapBytePad(width, depth) * height;
--    if (sizeof(size) == 4) {
--        if (size < width * height)
--            return BadAlloc;
--        /* thankfully, offset is unsigned */
--        if (stuff->offset + size < size)
--            return BadAlloc;
--    }
- 
-     if (stuff->depth != 1)
-     {
-@@ -801,7 +793,17 @@ ProcPanoramiXShmCreatePixmap(
- 	client->errorValue = stuff->depth;
-         return BadValue;
-     }
-+
- CreatePmap:
-+    size = PixmapBytePad(width, depth) * height;
-+    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
-+        if (size < width * height)
-+            return BadAlloc;
-+        /* thankfully, offset is unsigned */
-+        if (stuff->offset + size < size)
-+            return BadAlloc;
-+    }
-+
-     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- 
-     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
-@@ -1126,14 +1128,6 @@ ProcShmCreatePixmap(client)
-     }
-     if (width > 32767 || height > 32767)
- 	return BadAlloc;
--    size = PixmapBytePad(width, depth) * height;
--    if (sizeof(size) == 4) {
--	if (size < width * height)
--	    return BadAlloc;
--	/* thankfully, offset is unsigned */
--	if (stuff->offset + size < size)
--	    return BadAlloc;
--    }
- 
-     if (stuff->depth != 1)
-     {
-@@ -1144,7 +1138,17 @@ ProcShmCreatePixmap(client)
- 	client->errorValue = stuff->depth;
-         return BadValue;
-     }
-+
- CreatePmap:
-+    size = PixmapBytePad(width, depth) * height;
-+    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
-+	if (size < width * height)
-+	    return BadAlloc;
-+	/* thankfully, offset is unsigned */
-+	if (stuff->offset + size < size)
-+	    return BadAlloc;
-+    }
-+
-     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
- 			    pDraw->pScreen, stuff->width,
--- 
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch b/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
deleted file mode 100644
index 6e5baf111ccf..000000000000
--- a/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161 Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf@suse.de>
-Date: Mon, 21 Jan 2008 16:13:21 +0100
-Subject: [PATCH] CVE-2007-6429: Always test for size+offset wrapping.
-
----
- Xext/shm.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index e46f6fc..a7a1ecf 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -799,10 +799,10 @@ CreatePmap:
-     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
-         if (size < width * height)
-             return BadAlloc;
--        /* thankfully, offset is unsigned */
--        if (stuff->offset + size < size)
--            return BadAlloc;
-     }
-+    /* thankfully, offset is unsigned */
-+    if (stuff->offset + size < size)
-+	return BadAlloc;
- 
-     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- 
-@@ -1144,10 +1144,10 @@ CreatePmap:
-     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
- 	if (size < width * height)
- 	    return BadAlloc;
--	/* thankfully, offset is unsigned */
--	if (stuff->offset + size < size)
--	    return BadAlloc;
-     }
-+    /* thankfully, offset is unsigned */
-+    if (stuff->offset + size < size)
-+	return BadAlloc;
- 
-     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
--- 
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch b/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
deleted file mode 100644
index 3a8dbd916e26..000000000000
--- a/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
-Date: Wed, 16 Jan 2008 20:24:11 -0500
-Subject: [PATCH] Don't break grab and focus state for a window when redirecting it.
-
-Composite uses an unmap/map cycle to trigger backing pixmap allocation
-and cliprect recomputation when a window is redirected or unredirected.
-To avoid protocol visible side effects, map and unmap events are
-disabled temporarily.  However, when a window is unmapped it is also
-removed from grabs and loses focus, but these state changes are not
-disabled.
-
-This change supresses the unmap side effects during the composite
-unmap/map cycle and fixes this bug:
-
-  http://bugzilla.gnome.org/show_bug.cgi?id=488264
-
-where compiz would cause gnome-screensaver to lose its grab when
-compiz unredirects the fullscreen lock window.
----
- dix/window.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/dix/window.c b/dix/window.c
-index 33cf76b..1ccf126 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -2993,7 +2993,8 @@ UnrealizeTree(
- 	    } 
- #endif
- 	    (* Unrealize)(pChild);
--	    DeleteWindowFromAnyEvents(pChild, FALSE);
-+	    if (MapUnmapEventsEnabled(pWin))
-+		DeleteWindowFromAnyEvents(pChild, FALSE);
- 	    if (pChild->viewable)
- 	    {
- #ifdef DO_SAVE_UNDERS
--- 
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
deleted file mode 100644
index e9a6aade0870..000000000000
--- a/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
-index aac3b51..c9ee019 100644
---- a/doc/Xserver.man.pre
-+++ b/doc/Xserver.man.pre
-@@ -508,8 +508,7 @@ its parent process after it has set up the various connection schemes.
- \fIXdm\fP uses this feature to recognize when connecting to the server
- is possible.
- .SH FONTS
--The X server
--can obtain fonts from directories and/or from font servers.
-+The X server can obtain fonts from directories and/or from font servers.
- The list of directories and font servers
- the X server uses when trying to open a font is controlled
- by the \fIfont path\fP.  
-@@ -517,8 +516,45 @@ by the \fIfont path\fP.
- The default font path is
- __default_font_path__ .
- .LP
-+A special kind of directory can be specified using the the \fBcatalogue\fP:
-+prefix. Directories specified this way can contain symlinks pointing to the
-+real font directories. See the FONTPATH.D section for details.
-+.LP
- The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
- after the server has started.
-+.SH "FONTPATH.D"
-+You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
-+The directory specified after the catalogue: prefix will be scanned for symlinks
-+and each symlink destination will be added as a local fontfile FPE.
-+.PP
-+The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
-+will be passed through to the underlying fontfile FPE. The only exception is
-+the newly introduced '\fBpri\fR' attribute, which will be used for ordering
-+the font paths specified by the symlinks.
-+
-+An example configuration:
-+
-+.nf
-+    75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi
-+    ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript
-+    misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
-+    type1:pri=40 \-> /usr/share/X11/fonts/Type1
-+    type1:pri=50 \-> /usr/share/fonts/default/Type1
-+.fi
-+
-+This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
-+'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
-+the attribute unscaled etc. This is functionally equivalent to setting
-+the following font path:
-+
-+.nf
-+    /usr/share/X11/fonts/misc:unscaled,
-+    /usr/share/X11/fonts/75dpi:unscaled,
-+    /usr/share/X11/fonts/Type1,
-+    /usr/share/fonts/default/Type1,
-+    /usr/share/fonts/default/ghostscript
-+.fi
-+
- .SH FILES
- .TP 30
- .I /etc/X\fBn\fP.hosts
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index ce54ea9..54d8eaa 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -293,15 +293,50 @@ server searches for font databases.
- Multiple
- .B FontPath
- entries may be specified, and they will be concatenated to build up the
--fontpath used by the server.  Font path elements may be either absolute
--directory paths, or a font server identifier.
-+fontpath used by the server.  Font path elements can be absolute
-+directory paths, catalogue directories or a font server identifier. The
-+formats of the later two are explained below:
-+.PP
-+.RS 7
-+Catalogue directories:
-+.PP
-+.RS 4
-+Catalogue directories can be specified using the prefix \fBcatalogue:\fR
-+before the directory name. The directory can then be populated with
-+symlinks pointing to the real font directories, using the following
-+syntax in the symlink name:
-+.PP
-+.RS 4
-+.IR <identifier> : [attribute]: pri= <priority>
-+.RE
-+.PP
-+where
-+.I <identifier>
-+is an alphanumeric identifier,
-+.I [attribute]
-+is an attribute wich will be passed to the underlying FPE and
-+.I <priority>
-+is a number used to order the fontfile FPEs. Examples:
-+.PP
-+.RS 4
-+.nf
-+.I 75dpi:unscaled:pri=20  -> /usr/share/X11/fonts/75dpi
-+.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
-+.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
-+.fi
-+.PP
-+.RE .RE .RE
-+.PP
-+.RS 7
-+Font server identifiers:
-+.PP
-+.RS 4
- Font server identifiers have the form:
-+.RS 4
- .PP
--.RS 11
- .IR <trans> / <hostname> : <port\-number>
- .RE
- .PP
--.RS 7
- where
- .I <trans>
- is the transport type to use to connect to the font server (e.g.,
-@@ -313,10 +348,11 @@ for a TCP/IP connection),
- is the hostname of the machine running the font server, and
- .I <port\-number>
- is the port number that the font server is listening on (usually 7100).
-+.RE
- .PP
- When this entry is not specified in the config file, the server falls back
- to the compiled\-in default font path, which contains the following
--font path elements:
-+font path elements (which can be set inside a catalogue directory):
- .PP
- .RS 4
- .nf
diff --git a/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch b/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
deleted file mode 100644
index 9ec79fda633b..000000000000
--- a/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Title       : x11-base/xorg-server-1.3 and 1.4 consumes 100% CPU, locking the ke
-yboard, apparently triggered by opening an OpenOffice pulldown menu
-Assignee    : x11@gentoo.org
-Reported    : 2007-10-26 03:51 0000
-Updated     : 2007-11-07 07:21:56 0000
-Status      : NEW
-URL         : https://bugs.freedesktop.org/show_bug.cgi?id=10525
-Severity    : critical
-Priority    : P2
-Reporter    : smw@alcor.concordia.ca
-Product     : Gentoo Linux
-Component   : Server
-Keywords    : Inclusion
-CC          : tetromino@gmail.com
-Comments    : 3
-Attachments : 0
-URL         : http://bugs.gentoo.org/show_bug.cgi?id=197104
-
-commit a5b8053606d6e786cdcf6734f271acc05f9cc588
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date:   Tue Sep 11 11:37:06 2007 -0400
-
-    Ignore - not just block - SIGALRM around Popen()/Pclose().
-
-    Because our "popen" implementation uses stdio, and because nobody's stdio
-    library is capable of surviving signals, we need to make absolutely sure
-    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
-    open a menu in openoffice, and it recompiles XKB to deal with the
-    accelerators, and you popen xkbcomp because we suck, then the scheduler
-    will tell you you're taking forever doing something stupid, and the
-    wait() code will get confused, and input will hang and your CPU usage
-    slams to 100%.  Down, not across.
-
-diff --git a/os/utils.c b/os/utils.c
-index 3bb7dbe..afcaae4 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1720,6 +1720,8 @@ static struct pid {
-     int pid;
- } *pidlist;
- 
-+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
-+
- pointer
- Popen(char *command, char *type)
- {
-@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
- 	return NULL;
-     }
- 
-+    /* Ignore the smart scheduler while this is going on */
-+    old_alarm = signal(SIGALRM, SIG_IGN);
-+
-     switch (pid = fork()) {
-     case -1: 	/* error */
- 	close(pdes[0]);
- 	close(pdes[1]);
- 	xfree(cur);
-+	signal(SIGALRM, old_alarm);
- 	return NULL;
-     case 0:	/* child */
- 	if (setgid(getgid()) == -1)
-@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
-     /* allow EINTR again */
-     OsReleaseSignals ();
-     
-+    signal(SIGALRM, old_alarm);
-+
-     return pid == -1 ? -1 : pstat;
- }
- 
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-build.patch b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
deleted file mode 100644
index 07f43abcde6a..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
-index d644b5d..83f8a4a 100644
---- a/hw/dmx/dmxinput.c
-+++ b/hw/dmx/dmxinput.c
-@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
-         if (!dmxInput->detached && dmxInput->updateWindowInfo)
-             dmxInput->updateWindowInfo(dmxInput, type, pWindow);
- }
-+
-+int
-+NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
-+{
-+    return BadRequest;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr pDev)
-+{
-+}
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-link.patch b/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
deleted file mode 100644
index 909442d578d7..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
-index 002ea11..15dc281 100644
---- a/hw/dmx/Makefile.am
-+++ b/hw/dmx/Makefile.am
-@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
-              $(GLX_LIBS) \
-              input/libdmxinput.a \
-              config/libdmxconfig.a \
-+             @XSERVER_LIBS@ \
-              @DMXMODULES_LIBS@
- 
- # Man page
diff --git a/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch b/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
deleted file mode 100644
index 35ca0290794f..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62fdd78..7a37590 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then
-        XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
-     fi
- 
--    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
-+    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
-     if test "x$XEPHYR" = xauto; then
-         XEPHYR=$xephyr
-     fi
-diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
-index cc3019f..1738d0f 100644
---- a/hw/kdrive/ephyr/Makefile.am
-+++ b/hw/kdrive/ephyr/Makefile.am
-@@ -28,6 +28,7 @@ Xephyr_LDADD = 						\
- 	libxephyr-hostx.a			        \
- 	../../../exa/libexa.la				\
- 	@KDRIVE_LIBS@					\
-+	@XSERVER_LIBS@					\
-         @XEPHYR_LIBS@
- 
- Xephyr_DEPENDENCIES =	\
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-build.patch b/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
deleted file mode 100644
index 98fbacf5d70e..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
-index a465c4c..1e7652e 100644
---- a/hw/xprint/ddxInit.c
-+++ b/hw/xprint/ddxInit.c
-@@ -310,6 +310,17 @@ ChangeDeviceControl (
-     return BadMatch;
- }
- 
-+int
-+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
-+{
-+    return BadValue;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr dev)
-+{
-+}
-+
- void
- OpenInputDevice (
-     DeviceIntPtr dev,
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-link.patch b/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
deleted file mode 100644
index 1cf720555a48..000000000000
--- a/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
-index dc8764a..728e69d 100644
---- a/hw/xprint/Makefile.am
-+++ b/hw/xprint/Makefile.am
-@@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir)
- Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
- 	pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
- 	$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
--	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@
-+	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@ @XSERVER_LIBS@
- 
- miinitext-wrapper.c:
- 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch
deleted file mode 100644
index 13ffb5f656d3..000000000000
--- a/x11-base/xorg-server/files/1.4-ia64.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- /dev/null	1969-12-31 16:00:00.000000000 -0800
-+++ hw/xfree86/os-support/shared/ia64Pci.h	2007-08-03 12:56:38.000000000 -0700
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright 2004, Egbert Eich
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to
-+ * deal in the Software without restriction, including without limitation the
-+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-+ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of Egbert Eich shall not
-+ * be used in advertising or otherwise to promote the sale, use or other deal-
-+ *ings in this Software without prior written authorization from Egbert Eich.
-+ *
-+ */
-+#ifdef HAVE_XORG_CONFIG_H
-+#include <xorg-config.h>
-+#endif
-+
-+#ifndef _IA64_PCI_H
-+# define _IA64_PCI_H
-+
-+#include "Pci.h"
-+
-+typedef enum {
-+    NONE_CHIPSET,
-+    I460GX_CHIPSET,
-+    E8870_CHIPSET,
-+    ZX1_CHIPSET,
-+    ALTIX_CHIPSET
-+} IA64Chipset;
-+
-+# ifdef OS_PROBE_PCI_CHIPSET
-+extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
-+# endif
-+#endif
diff --git a/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch b/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
deleted file mode 100644
index ece24eb7f565..000000000000
--- a/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d988da6eee8422774dff364050bf431b843a714a
-Author: Arkadiusz Miskiewicz <arekm@maven.pl>
-Date:   Thu Dec 13 00:09:08 2007 +0200
-
-    Xprint: Clean up generated files
-
-    Remember to clean generated wrapper files.
-    (cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)
-
-diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
-index dc8764a..f834966 100644
---- a/hw/xprint/Makefile.am
-+++ b/hw/xprint/Makefile.am
-@@ -41,3 +41,5 @@ Xprt_SOURCES =			\
-         $(top_srcdir)/fb/fbcmap_mi.c
- 
- EXTRA_DIST = ValTree.c
-+
-+CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c
diff --git a/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch b/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch
deleted file mode 100644
index c230dd1af665..000000000000
--- a/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From af8cef461c4d107f7a03645568a635d0458da9b8 Mon Sep 17 00:00:00 2001
-From: Alan Hourihane <alanh@tungstengraphics.com>
-Date: Wed, 24 Sep 2008 14:24:36 +0100
-Subject: [PATCH] only build dri2 when DRI2 is enabled
-
----
- glx/Makefile.am |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/glx/Makefile.am b/glx/Makefile.am
-index 39b96d7..0214295 100644
---- a/glx/Makefile.am
-+++ b/glx/Makefile.am
-@@ -45,9 +45,13 @@ glapi_sources =					\
- 	glthread.h				\
- 	glprocs.h
- 
-+if DRI2
-+GLXDRI_SOURCE = glxdri2.c
-+endif
-+
- libglxdri_la_SOURCES = \
-         glxdri.c \
--        glxdri2.c \
-+	$(GLXDRI2_SOURCE) \
- 	glxdricommon.h \
-         extension_string.c \
-         extension_string.h
--- 
-1.6.0.1
-
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
deleted file mode 100644
index 2d0f4695fd60..000000000000
--- a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=235789
-2008-09-09 Martin von Gagern
-
---- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h	2008-09-09 17:24:59.000000000 +0200
-+++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h	2008-09-09 18:01:53.000000000 +0200
-@@ -67,6 +67,13 @@
- #include "os.h"
- #endif
- 
-+#ifndef IF_MASK
-+#define IF_MASK X86_EFLAGS_IF
-+#endif
-+#ifndef IOPL_MASK
-+#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- typedef unsigned char	U8;
- typedef unsigned short	U16;
- typedef unsigned int	U32;
diff --git a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
deleted file mode 100644
index ffb3e0dea757..000000000000
--- a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8918c50440de301887af8006f2dc72d64adf9f9c Mon Sep 17 00:00:00 2001
-From: Remi Cardona <remi@gentoo.org>
-Date: Sat, 18 Oct 2008 12:23:51 +0200
-Subject: [PATCH] force LC_ALL=C when running awk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This bug was reported by a user trying to build the server with a
-Turkish locale (tr_TR). The problem is that the Turkish alphabet is
-latin-based, but not entirely similar. The bug comes from vesamodes
-which has "Interlaced", which is then converted to lowercase by
-modelines2c.awk. Execept that with a Turkish locale
-tolower("Interlaced") is not "interlaced" but "ınterlaced", which the
-rest of the script fails to understand.
-
-This patch forces LC_ALL=C when running the awk script to always get the
-intended latin en_US alphabet.
----
- hw/xfree86/common/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
-index 0f44075..723973a 100644
---- a/hw/xfree86/common/Makefile.am
-+++ b/hw/xfree86/common/Makefile.am
-@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
- MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
- 
- xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
--	cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
-+	cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
- 
- BUILT_SOURCES = xf86DefModeSet.c
- 
--- 
-1.6.0.2
-
diff --git a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch b/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
deleted file mode 100644
index 50719ad86b53..000000000000
--- a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fe82a1fe634a2e0ceb030de90309d26044c7b75e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 1 Nov 2007 15:06:17 -0400
-Subject: [PATCH] Enable builtin font FPE.
-
----
- dix/dixfonts.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index c21b3ec..c951b05 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1890,11 +1890,8 @@ InitFonts (void)
-     } else 
- #endif
-     {
--#ifdef BUILTIN_FONTS
-         BuiltinRegisterFpeFunctions();
--#else
- 	FontFileRegisterFpeFunctions();
--#endif
- #ifndef NOFONTSERVERACCESS
- 	fs_register_fpe_functions();
- #endif
--- 
-1.5.3.4
-
diff --git a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
deleted file mode 100644
index 23eeca125de9..000000000000
--- a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Michel DÃ¤nzer <michel@tungstengraphics.com>
-Date: Thu, 24 May 2007 10:10:05 +0000 (+0200)
-Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-X-Git-Tag: xorg-server-1.3.99.0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc
-
-Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-
-This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
----
-
---- a/hw/xfree86/common/xf86xv.c
-+++ b/hw/xfree86/common/xf86xv.c
-@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
- 	winPriv->next = PrivRoot;
- 	pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
-    }
-+
-+   portPriv->pDraw = (DrawablePtr)pWin;
-+
-    return Success;
- }
- 
-@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
-   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-   if(result != Success) return result;
- 
--  portPriv->pDraw = pDraw;
-   portPriv->type = XvInputMask;
- 
-   /* save a copy of these parameters */
-@@ -1479,7 +1481,6 @@ xf86XVPutStill(
- 
-      xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-      portPriv->isOn = XV_ON;
--     portPriv->pDraw = pDraw;
-      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-      portPriv->type = 0;  /* no mask means it's transient and should
-@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
-   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
-   if(result != Success) return result;
- 
--  portPriv->pDraw = pDraw;
-   portPriv->type = XvOutputMask;
- 
-   /* save a copy of these parameters */
-@@ -1784,7 +1784,6 @@ xf86XVPutImage(
- 	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
- 
-      portPriv->isOn = XV_ON;
--     portPriv->pDraw = pDraw;
-      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
-      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
-      portPriv->type = 0;  /* no mask means it's transient and should
diff --git a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
deleted file mode 100644
index fd2c5ad2a3f5..000000000000
--- a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Gentoo bug #191964
-freedesktop.org bug #7447 attachment #11368
-Fixed in 1.4 and newer
-
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index f555411..006e808 100644
---- a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -461,7 +461,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
-     ScreenPtr	    pScreen = pWin->drawable.pScreen;
-     WindowPtr	    pParent = pWin->parent;
-     PixmapPtr	    pPixmap;
--    GCPtr	    pGC;
- 
-     pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth);
- 
-@@ -471,25 +470,63 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
-     pPixmap->screen_x = x;
-     pPixmap->screen_y = y;
-     
--    pGC = GetScratchGC (pWin->drawable.depth, pScreen);
--    
--    /*
--     * Copy bits from the parent into the new pixmap so that it will
--     * have "reasonable" contents in case for background None areas.
--     */
--    if (pGC)
-+    if (pParent->drawable.depth == pWin->drawable.depth)
-     {
--	XID val = IncludeInferiors;
-+	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);
- 	
--	ValidateGC(&pPixmap->drawable, pGC);
--	dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
--	(*pGC->ops->CopyArea) (&pParent->drawable,
--			       &pPixmap->drawable,
--			       pGC,
--			       x - pParent->drawable.x,
--			       y - pParent->drawable.y,
--			       w, h, 0, 0);
--	FreeScratchGC (pGC);
-+	/*
-+	 * Copy bits from the parent into the new pixmap so that it will
-+	 * have "reasonable" contents in case for background None areas.
-+	 */
-+	if (pGC)
-+	{
-+	    XID val = IncludeInferiors;
-+	    
-+	    ValidateGC(&pPixmap->drawable, pGC);
-+	    dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
-+	    (*pGC->ops->CopyArea) (&pParent->drawable,
-+				   &pPixmap->drawable,
-+				   pGC,
-+				   x - pParent->drawable.x,
-+				   y - pParent->drawable.y,
-+				   w, h, 0, 0);
-+	    FreeScratchGC (pGC);
-+	}
-+    }
-+    else
-+    {
-+	PictFormatPtr	pSrcFormat = compWindowFormat (pParent);
-+	PictFormatPtr	pDstFormat = compWindowFormat (pWin);
-+	XID		inferiors = IncludeInferiors;
-+	int		error;
-+
-+	PicturePtr	pSrcPicture = CreatePicture (None,
-+						     &pParent->drawable,
-+						     pSrcFormat,
-+						     CPSubwindowMode,
-+						     &inferiors,
-+						     serverClient, &error);
-+						    
-+	PicturePtr	pDstPicture = CreatePicture (None,
-+						     &pPixmap->drawable,
-+						     pDstFormat,
-+						     0, 0,
-+						     serverClient, &error);
-+
-+	if (pSrcPicture && pDstPicture)
-+	{
-+	    CompositePicture (PictOpSrc,
-+			      pSrcPicture,
-+			      NULL,
-+			      pDstPicture,
-+			      x - pParent->drawable.x,
-+			      y - pParent->drawable.y,
-+			      0, 0, 0, 0, w, h);
-+	}
-+	if (pSrcPicture)
-+	    FreePicture (pSrcPicture, 0);
-+	if (pDstPicture)
-+	    FreePicture (pDstPicture, 0);
-     }
-     return pPixmap;
- }
-diff --git a/composite/compint.h b/composite/compint.h
-index 38b1777..f69595c 100644
---- a/composite/compint.h
-+++ b/composite/compint.h
-@@ -237,6 +237,9 @@ compCheckTree (ScreenPtr pScreen);
- #define compCheckTree(s)
- #endif
- 
-+PictFormatPtr
-+compWindowFormat (WindowPtr pWin);
-+
- void
- compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap);
- 
-diff --git a/composite/compwindow.c b/composite/compwindow.c
-index a4c4e6f..bfd2946 100644
---- a/composite/compwindow.c
-+++ b/composite/compwindow.c
-@@ -685,7 +685,7 @@ compGetWindowVisual (WindowPtr pWin)
-     return 0;
- }
- 
--static PictFormatPtr
-+PictFormatPtr
- compWindowFormat (WindowPtr pWin)
- {
-     ScreenPtr	pScreen = pWin->drawable.pScreen;
diff --git a/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
deleted file mode 100644
index 3d34b34285bf..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2008-04-17 16:53:09.000000000 -0500
-+++ configure.ac	2008-04-17 16:53:29.000000000 -0500
-@@ -1962,7 +1962,9 @@
- 
- AC_SUBST([DIX_CFLAGS])
- 
--AC_SUBST([libdir exec_prefix prefix])
-+AC_SUBST([libdir])
-+AC_SUBST([exec_prefix])
-+AC_SUBST([prefix])
- 
- # Man page sections - used in config utils & generating man pages
- XORG_MANPAGE_SECTIONS
diff --git a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
deleted file mode 100644
index ca5bbb4c27e0..000000000000
--- a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hw/xfree86/modes/xf86EdidModes.c	2007-05-02 01:23:52.000000000 +0200
-+++ hw/xfree86/modes/xf86EdidModes.c.new	2007-05-02 01:24:09.000000000 +0200
-@@ -92,6 +92,11 @@
- 	DDC->vendor.prod_id == 638)
- 	return TRUE;
-     
-+    /* Samsung SyncMaster 225BW */
-+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-+	DDC->vendor.prod_id == 596)
-+	return TRUE;
-+
-     return FALSE;
- }
- 
diff --git a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
deleted file mode 100644
index a6a35f99b33a..000000000000
--- a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic	2006-03-06 13:57:45.000000000 -0500
-+++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am	2006-03-06 13:59:11.000000000 -0500
-@@ -23,7 +23,7 @@
- 	DRI.c \
- 	Extensions.c
- 
--AM_CFLAGS = $(XORG_CFLAGS)
-+AM_CFLAGS = $(XORG_CFLAGS) -fPIC
- 
- EXTRA_DIST = \
- 	Configint.h \
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff
deleted file mode 100644
index 4eb7e1db2c00..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/Xext/security.c b/Xext/security.c
-index ba057de..f34c463 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -651,15 +651,19 @@ SProcSecurityGenerateAuthorization(
-     register char 	n;
-     CARD32 *values;
-     unsigned long nvalues;
-+    int values_offset;
- 
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xSecurityGenerateAuthorizationReq);
-     swaps(&stuff->nbytesAuthProto, n);
-     swaps(&stuff->nbytesAuthData, n);
-     swapl(&stuff->valueMask, n);
--    values = (CARD32 *)(&stuff[1]) +
--	((stuff->nbytesAuthProto + (unsigned)3) >> 2) +
--	((stuff->nbytesAuthData + (unsigned)3) >> 2);
-+    values_offset = ((stuff->nbytesAuthProto + (unsigned)3) >> 2) +
-+		    ((stuff->nbytesAuthData + (unsigned)3) >> 2);
-+    if (values_offset > 
-+	stuff->length - (sz_xSecurityGenerateAuthorizationReq >> 2))
-+	return BadLength;
-+    values = (CARD32 *)(&stuff[1]) + values_offset;
-     nvalues = (((CARD32 *)stuff) + stuff->length) - values;
-     SwapLongs(values, nvalues);
-     return ProcSecurityGenerateAuthorization(client);
-diff --git a/record/record.c b/record/record.c
-index 0ed8f84..9a166d6 100644
---- a/record/record.c
-+++ b/record/record.c
-@@ -2656,7 +2656,7 @@ SProcRecordQueryVersion(ClientPtr client)
- } /* SProcRecordQueryVersion */
- 
- 
--static void
-+static int
- SwapCreateRegister(xRecordRegisterClientsReq *stuff)
- {
-     register char n;
-@@ -2667,11 +2667,17 @@ SwapCreateRegister(xRecordRegisterClientsReq *stuff)
-     swapl(&stuff->nClients, n);
-     swapl(&stuff->nRanges, n);
-     pClientID = (XID *)&stuff[1];
-+    if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2))
-+	return BadLength;
-     for (i = 0; i < stuff->nClients; i++, pClientID++)
-     {
- 	swapl(pClientID, n);
-     }
-+    if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2)
-+	- stuff->nClients)
-+	return BadLength;
-     RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges);
-+    return Success;
- } /* SwapCreateRegister */
- 
- 
-@@ -2679,11 +2685,13 @@ static int
- SProcRecordCreateContext(ClientPtr client)
- {
-     REQUEST(xRecordCreateContextReq);
-+    int			status;
-     register char 	n;
- 
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq);
--    SwapCreateRegister((pointer)stuff);
-+    if ((status = SwapCreateRegister((pointer)stuff)) != Success)
-+	return status;
-     return ProcRecordCreateContext(client);
- } /* SProcRecordCreateContext */
- 
-@@ -2692,11 +2700,13 @@ static int
- SProcRecordRegisterClients(ClientPtr client)
- {
-     REQUEST(xRecordRegisterClientsReq);
-+    int			status;
-     register char 	n;
- 
-     swaps(&stuff->length, n);
-     REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq);
--    SwapCreateRegister((pointer)stuff);
-+    if ((status = SwapCreateRegister((pointer)stuff)) != Success)
-+	return status;
-     return ProcRecordRegisterClients(client);
- } /* SProcRecordRegisterClients */
- 
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff
deleted file mode 100644
index 180d126312c1..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Xext/shm.c b/Xext/shm.c
-index ac587be..e08df36 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -831,8 +831,17 @@ ProcShmPutImage(client)
-         return BadValue;
-     }
- 
--    VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
--		   client);
-+    /* 
-+     * There's a potential integer overflow in this check:
-+     * VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
-+     *                client);
-+     * the version below ought to avoid it
-+     */
-+    if (stuff->totalHeight != 0 && 
-+	length > (shmdesc->size - stuff->offset)/stuff->totalHeight) {
-+	client->errorValue = stuff->totalWidth;
-+	return BadValue;
-+    }
-     if (stuff->srcX > stuff->totalWidth)
-     {
- 	client->errorValue = stuff->srcX;
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff
deleted file mode 100644
index f14afce8bce1..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/render/glyph.c b/render/glyph.c
-index 583a52b..42ae65d 100644
---- a/render/glyph.c
-+++ b/render/glyph.c
-@@ -42,6 +42,12 @@
- #include "picturestr.h"
- #include "glyphstr.h"
- 
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- /*
-  * From Knuth -- a good choice for hash/rehash values is p, p-2 where
-  * p and p-2 are both prime.  These tables are sized to have an extra 10%
-@@ -626,8 +632,12 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth)
-     int		     size;
-     GlyphPtr	     glyph;
-     int		     i;
--
--    size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]);
-+    size_t	     padded_width;
-+    
-+    padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]);
-+    if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height)
-+	return 0;
-+    size = gi->height * padded_width;
-     glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec));
-     if (!glyph)
- 	return 0;
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff
deleted file mode 100644
index 07493313a7a4..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/render/render.c b/render/render.c
-index caaa278..b53e878 100644
---- a/render/render.c
-+++ b/render/render.c
-@@ -1504,6 +1504,8 @@ ProcRenderCreateCursor (ClientPtr client)
-     pScreen = pSrc->pDrawable->pScreen;
-     width = pSrc->pDrawable->width;
-     height = pSrc->pDrawable->height;
-+    if (height && width > UINT32_MAX/(height*sizeof(CARD32)))
-+	return BadAlloc;
-     if ( stuff->x > width 
-       || stuff->y > height )
- 	return (BadMatch);
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff
deleted file mode 100644
index a254d7aaff94..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/render/render.c b/render/render.c
-index 74c5f63..b53e878 100644
---- a/render/render.c
-+++ b/render/render.c
-@@ -1920,6 +1920,8 @@ static int ProcRenderCreateLinearGradient (ClientPtr client)
-     LEGAL_NEW_RESOURCE(stuff->pid, client);
- 
-     len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
-+    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
-+	return BadLength;
-     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
-         return BadLength;
- 
-@@ -2493,18 +2495,18 @@ SProcRenderCreateSolidFill(ClientPtr client)
-     return (*ProcRenderVector[stuff->renderReqType]) (client);
- }
- 
--static void swapStops(void *stuff, int n)
-+static void swapStops(void *stuff, int num)
- {
--    int i;
-+    int i, n;
-     CARD32 *stops;
-     CARD16 *colors;
-     stops = (CARD32 *)(stuff);
--    for (i = 0; i < n; ++i) {
-+    for (i = 0; i < num; ++i) {
-         swapl(stops, n);
-         ++stops;
-     }
-     colors = (CARD16 *)(stops);
--    for (i = 0; i < 4*n; ++i) {
-+    for (i = 0; i < 4*num; ++i) {
-         swaps(stops, n);
-         ++stops;
-     }
-@@ -2527,6 +2529,8 @@ SProcRenderCreateLinearGradient (ClientPtr client)
-     swapl(&stuff->nStops, n);
- 
-     len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
-+    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
-+	return BadLength;
-     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
-         return BadLength;
- 
-@@ -2554,6 +2558,8 @@ SProcRenderCreateRadialGradient (ClientPtr client)
-     swapl(&stuff->nStops, n);
- 
-     len = (client->req_len << 2) - sizeof(xRenderCreateRadialGradientReq);
-+    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
-+	return BadLength;
-     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
-         return BadLength;
- 
-@@ -2578,6 +2584,8 @@ SProcRenderCreateConicalGradient (ClientPtr client)
-     swapl(&stuff->nStops, n);
- 
-     len = (client->req_len << 2) - sizeof(xRenderCreateConicalGradientReq);
-+    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
-+	return BadLength;
-     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
-         return BadLength;
- 
diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init
deleted file mode 100644
index e5fed1b60c8e..000000000000
--- a/x11-base/xorg-server/files/xprint.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $
-
-opts="${opts} get_xpserverlist lsprinters"
-
-depend() {
-	use cupsd
-}
-
-start() {
-	ebegin "Starting xprint"
-	/usr/lib/misc/xprint start > /dev/null
-	eend $?
-}
-
-get_xpserverlist() {
-	/usr/lib/misc/xprint get_xpserverlist
-}
-
-lsprinters() {
-	/usr/lib/misc/xprint lsprinters
-}
-
-stop() {
-	ebegin "Stopping xprint"
-	/usr/lib/misc/xprint stop > /dev/null
-	eend $?
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901-r1.ebuild
deleted file mode 100644
index 0729822c0a1a..000000000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.901-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2009 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.6.3.901-r1.ebuild,v 1.2 2009/09/04 23:51:31 remi Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib versionator
-
-SRC_URI="${SRC_URI}"
-#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.4.0
-	>=x11-libs/xtrans-1.2.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXext-1.0.4
-	>=x11-libs/libX11-1.1.5
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXmu-1.0.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXi-1.2.1
-	>=x11-libs/pixman-0.14.0
-	media-libs/freetype
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	x11-apps/xkbcomp
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
-	>=app-admin/eselect-opengl-1.0.7
-	>=x11-libs/libXaw-1.0.5
-	>=x11-libs/libXpm-3.5.7
-	>=x11-libs/libpciaccess-0.10.3
-	dmx? (
-		>=x11-libs/libdmx-1.0.2
-		>=x11-libs/libXfixes-4.0.3
-	)
-	!minimal? (
-		>=x11-libs/libXtst-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=media-libs/mesa-7.3_rc1[nptl=]
-	)
-	>=x11-libs/libxkbui-1.0.2
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent
-	# Xaw is dmx-dependent
-	# Xpm is dmx-dependent, pulls in Xt
-	# xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.99.4
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.4
-	>=x11-proto/xproto-7.0.14
-	>=x11-proto/xf86dgaproto-2.0.3
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.2
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/recordproto-1.13.2
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/scrnsaverproto-1.1.0
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1.2
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.5.0
-	>=x11-proto/bigreqsproto-1.0.2
-	>=x11-proto/xcmiscproto-1.1.2
-	>=x11-proto/glproto-1.4.9
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.0.4
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3
-	)"
-
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-LICENSE="${LICENSE} MIT"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# Local customizations, unsuitable for upstream
-GENTOO_PATCHES=(
-	"${FILESDIR}/1.4-fpic-libxf86config.patch"
-	"${FILESDIR}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch"
-	)
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${GENTOO_PATCHES[@]}"
-	"${UPSTREAMED_PATCHES[@]}"
-	)
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable hal config-hal)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-
-	echo
-	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	echo
-	ewarn "You can generate a list of all installed packages in the x11-drivers"
-	ewarn "category using this command:"
-	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
-
-	ebeep 5
-	epause 10
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-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/lib{glx,dri}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
deleted file mode 100644
index 5a5a9715e483..000000000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2009 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.6.3.901.ebuild,v 1.1 2009/08/26 13:04:21 remi Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-# keithp put this one in archive/ instead of releases/ for unknown reasons
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
-SRC_URI="${SRC_URI}
-	${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
-#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_citron
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
-	input_devices_tslib
-	input_devices_virtualbox
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_ast
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_geode
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_intel
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vermilion
-	video_cards_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_xgi
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.4.0
-	>=x11-libs/xtrans-1.2.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXext-1.0.4
-	>=x11-libs/libX11-1.1.5
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXmu-1.0.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXi-1.2.1
-	>=x11-libs/pixman-0.14.0
-	media-libs/freetype
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	x11-apps/xkbcomp
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
-	>=app-admin/eselect-opengl-1.0.7
-	>=x11-libs/libXaw-1.0.5
-	>=x11-libs/libXpm-3.5.7
-	>=x11-libs/libpciaccess-0.10.3
-	dmx? (
-		>=x11-libs/libdmx-1.0.2
-		>=x11-libs/libXfixes-4.0.3
-	)
-	!minimal? (
-		>=x11-libs/libXtst-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=media-libs/mesa-7.3_rc1[nptl=]
-	)
-	>=x11-libs/libxkbui-1.0.2
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent
-	# Xaw is dmx-dependent
-	# Xpm is dmx-dependent, pulls in Xt
-	# xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.99.4
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.4
-	>=x11-proto/xproto-7.0.14
-	>=x11-proto/xf86dgaproto-2.0.3
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.2
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/recordproto-1.13.2
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/scrnsaverproto-1.1.0
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1.2
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.5.0
-	>=x11-proto/bigreqsproto-1.0.2
-	>=x11-proto/xcmiscproto-1.1.2
-	>=x11-proto/glproto-1.4.9
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.0.4
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3
-	)"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
-		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
-		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
-		input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
-		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
-		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.11.0  )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
-		video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.2 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
-		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
-		video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
-		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
-		!x11-drivers/xf86-video-impact
-		!x11-drivers/xf86-video-imstt
-		!x11-drivers/xf86-video-sunbw2
-		!x11-drivers/xf86-video-suncg14
-		!x11-drivers/xf86-video-suncg3
-		!x11-drivers/xf86-video-suncg6
-		!x11-drivers/xf86-video-suntcx
-		!x11-drivers/xf86-video-vermilion
-
-		!x11-drivers/xf86-video-cyrix
-		!x11-drivers/xf86-video-nsc
-		!x11-drivers/xf86-video-vga
-	)"
-LICENSE="${LICENSE} MIT"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# Local customizations, unsuitable for upstream
-GENTOO_PATCHES=(
-	"${FILESDIR}/1.4-fpic-libxf86config.patch"
-	)
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${GENTOO_PATCHES[@]}"
-	"${UPSTREAMED_PATCHES[@]}"
-	)
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable hal config-hal)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-
-	echo
-	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	echo
-	ewarn "You can generate a list of all installed packages in the x11-drivers"
-	ewarn "category using this command:"
-	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
-
-	ebeep 5
-	epause 10
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-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/lib{glx,dri}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.ebuild
deleted file mode 100644
index f84fe8ef2e50..000000000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2009 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.6.3.ebuild,v 1.3 2009/08/10 17:37:33 remi Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-# keithp put this one in archive/ instead of releases/ for unknown reasons
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
-SRC_URI="${SRC_URI}
-	${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
-#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_citron
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
-	input_devices_tslib
-	input_devices_virtualbox
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_ast
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_geode
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_intel
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vermilion
-	video_cards_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_xgi
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.4.0
-	>=x11-libs/xtrans-1.2.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXext-1.0.4
-	>=x11-libs/libX11-1.1.5
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXmu-1.0.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXi-1.2.1
-	>=x11-libs/pixman-0.14.0
-	media-libs/freetype
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	x11-apps/xkbcomp
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
-	>=app-admin/eselect-opengl-1.0.7
-	>=x11-libs/libXaw-1.0.5
-	>=x11-libs/libXpm-3.5.7
-	>=x11-libs/libpciaccess-0.10.3
-	dmx? (
-		>=x11-libs/libdmx-1.0.2
-		>=x11-libs/libXfixes-4.0.3
-	)
-	!minimal? (
-		>=x11-libs/libXtst-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=media-libs/mesa-7.3_rc1[nptl=]
-	)
-	>=x11-libs/libxkbui-1.0.2
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent
-	# Xaw is dmx-dependent
-	# Xpm is dmx-dependent, pulls in Xt
-	# xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.99.4
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.4
-	>=x11-proto/xproto-7.0.14
-	>=x11-proto/xf86dgaproto-2.0.3
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.2
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/recordproto-1.13.2
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/scrnsaverproto-1.1.0
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1.2
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.5.0
-	>=x11-proto/bigreqsproto-1.0.2
-	>=x11-proto/xcmiscproto-1.1.2
-	>=x11-proto/glproto-1.4.9
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.0.4
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3
-	)"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
-		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
-		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
-		input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
-		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
-		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.11.0  )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
-		video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.2 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
-		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
-		video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
-		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
-		!x11-drivers/xf86-video-impact
-		!x11-drivers/xf86-video-imstt
-		!x11-drivers/xf86-video-sunbw2
-		!x11-drivers/xf86-video-suncg14
-		!x11-drivers/xf86-video-suncg3
-		!x11-drivers/xf86-video-suncg6
-		!x11-drivers/xf86-video-suntcx
-		!x11-drivers/xf86-video-vermilion
-
-		!x11-drivers/xf86-video-cyrix
-		!x11-drivers/xf86-video-nsc
-		!x11-drivers/xf86-video-vga
-	)"
-LICENSE="${LICENSE} MIT"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# Local customizations, unsuitable for upstream
-GENTOO_PATCHES=(
-	"${FILESDIR}/1.4-fpic-libxf86config.patch"
-	)
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#	)
-
-PATCHES=(
-	"${GENTOO_PATCHES[@]}"
-	"${UPSTREAMED_PATCHES[@]}"
-	)
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable hal config-dbus)
-		$(use_enable hal config-hal)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-
-	echo
-	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	echo
-	ewarn "You can generate a list of all installed packages in the x11-drivers"
-	ewarn "category using this command:"
-	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
-
-	ebeep 5
-	epause 10
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-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/lib{glx,dri}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
author	Remi Cardona <remi@gentoo.org>	2009-09-28 07:41:03 +0000
committer	Remi Cardona <remi@gentoo.org>	2009-09-28 07:41:03 +0000
commit	e8d92cb323ccfab1e7fa80515f9ecdd007a417f4 (patch)
tree	c9f4dbffec4253df8ba78b98a2257682c5796943 /x11-base
parent	Version bump (diff)
download	historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.tar.gz historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.tar.bz2 historical-e8d92cb323ccfab1e7fa80515f9ecdd007a417f4.zip