Remove ancient xorg-server-1.4 version

22 files changed, 0 insertions, 1814 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f61c72e..4a98c1f 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -10,28 +10,9 @@ AUX 1.3.0.0-fix-randr-resizing.patch 1986 RMD160 7fe971a41e5659876596b921d33d316
 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.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
@@ -46,7 +27,6 @@ AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e
 AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
 AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
 AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
-AUX xorg-server-1.4-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
 AUX xorg-server-1.5.2-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
 AUX xorg-server-1.5.3-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
 AUX xorg-server-1.6.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
@@ -69,8 +49,6 @@ AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b0
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
 AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
-DIST MesaLib-7.0.2.tar.bz2 3353217 RMD160 3d471062b60889baef48a1a4596de6e32e1530cf SHA1 d16eaeb1d9d95d11d3b6d289b1ba87108b88da90 SHA256 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
-DIST xorg-server-1.4.0.90.tar.bz2 6315011 RMD160 181b3c682710265df3c6ed30e164be9290f1f39e SHA1 7c492ac32bd83b521f5c016e4728fccf9cba55db SHA256 b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
 DIST xorg-server-1.5.3-gentoo-patches-01.tar.bz2 34209 RMD160 b82276a38d2d293bd7ffdfb86829e6b8bad35b02 SHA1 659b03d33a47820ce0a8b137b585da99f3f1ccb6 SHA256 ced893a1e5766604cfdbf7904de936c84b0b7f218b1a47b00e83c6db05ca1bec
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
@@ -79,7 +57,6 @@ DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef4
 DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
 DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
 DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.4.0.90-r3.ebuild 19571 RMD160 2a18b5ff8b87141e0a6f06e3589d71e0a1f934dd SHA1 6fd1e7f78a2faefbc13f1ad5c3a8f77d121a458b SHA256 4f3375321e37883fa765105cbb7056f90e6d2d6e74d4ab06072a31d635618781
 EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257
 EBUILD xorg-server-1.6.5.ebuild 6897 RMD160 70aa46bdd55ff4517d10517f2d26b2fb9495d59c SHA1 4835b5c31a380fb573404123a7045abd5a902713 SHA256 f503bf6f5d693c0533af3e1cb88472a3b1132d28072287b8309e7f3d9021cabd
 EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
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 600d0ba..0000000
--- 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.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 54dead0..0000000
--- 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 a72ce3c..0000000
--- 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 ffbf8ac..0000000
--- 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 ac66b4d..0000000
--- 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 bb09eb8..0000000
--- 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 61cc4da..0000000
--- 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 903f2be..0000000
--- 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 6e5baf1..0000000
--- 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 3a8dbd9..0000000
--- 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 e9a6aad..0000000
--- 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 9ec79fd..0000000
--- 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 07f43ab..0000000
--- 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 909442d..0000000
--- 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 35ca029..0000000
--- 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 98fbacf..0000000
--- 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 1cf7205..0000000
--- 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 13ffb5f..0000000
--- 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 ece24eb..0000000
--- 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/xorg-server-1.4-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h	2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h	2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 			0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX			0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX			0x10000		/* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c	2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c	2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- 	int fd;
- 	unsigned int ioBase_phys;
-+	extern unsigned int IOPortBase;
- #endif
- 
- 	if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- 	}
- 	close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
-+#elif defined(__mips__)
-+	fd = open("/dev/mem", O_RDWR);
-+	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
-+			PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+			0x1fd00000);
-+	if (IOPortBase == MAP_FAILED) {
-+		xf86Msg(X_WARNING,
-+				"xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+				strerror(errno));
-+		return FALSE;
-+	}
-+	close(fd);
-+	xf86Msg(X_WARNING,
-+	       "xf86EnableIOPorts: map iobase (%x)\n",
-+	        IOPortBase);
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
-         if (ioperm(0, 1024, 1) || iopl(3)) {
-                 if (errno == ENODEV)
-                         ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
deleted file mode 100644
index 3a111cf..0000000
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
+++ /dev/null
@@ -1,604 +0,0 @@
-# Copyright 1999-2008 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.4.0.90-r3.ebuild,v 1.1 2008/02/01 21:47:19 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="7.0.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_amd
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vermilion
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	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}
-	3dfx
-	dri hal ipv6 minimal nptl sdl xprint"
-RDEPEND="hal? ( sys-apps/hal )
-	>=x11-libs/libXfont-1.3.1
-	>=x11-libs/xtrans-1.0.4
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXext-1.0.2
-	>=x11-libs/libX11-1.1.3
-	>=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.1.3
-	>=x11-libs/pixman-0.9.5
-	media-libs/freetype
-	>=media-libs/mesa-7.0.1
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-0.9
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.1
-	>=x11-apps/xauth-1.0.2
-	>=x11-apps/xinit-1.0.5
-	app-admin/eselect-opengl
-	>=x11-libs/libXaw-1.0.4
-	>=x11-libs/libXpm-3.5.7
-	>=x11-libs/libXxf86misc-1.0.1
-	>=x11-libs/libXxf86vm-1.0.1
-	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 )
-	>=x11-libs/libxkbui-1.0.2
-	>=x11-libs/liblbxutil-1.0.1
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	>=x11-proto/randrproto-1.2.1
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.2
-	>=x11-proto/xproto-7.0.10
-	>=x11-proto/xf86dgaproto-2.0.3
-	>=x11-proto/xf86miscproto-0.9.2
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.2
-	>=x11-proto/xf86bigfontproto-1.1.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/evieext-1.0.2
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1-r1
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.4.2.1
-	>=x11-proto/bigreqsproto-1.0.2
-	>=x11-proto/xcmiscproto-1.1.2
-	>=x11-proto/glproto-1.4.8
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	dri? ( >=x11-proto/xf86driproto-2.0.3
-		>=x11-libs/libdrm-2.3 )
-	xprint? ( >=x11-proto/printproto-1.0.3
-		>=x11-apps/mkfontdir-1.0.3
-		>=x11-apps/mkfontscale-1.0.3
-		>=x11-apps/xplsprinters-1.0.1 )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.1 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.1 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.2.1 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vermilion? ( >=x11-drivers/xf86-video-vermilion-1.0.0 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.433 )
-		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 )
-	)"
-LICENSE="${LICENSE} MIT"
-
-PATCHES="
-	${FILESDIR}/${PN}-1.4-loongson.patch
-	${FILESDIR}/1.4-ia64.patch
-	${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
-	${FILESDIR}/1.4-fpic-libxf86config.patch
-	${FILESDIR}/1.4-document-new-font-catalogs.patch
-	${FILESDIR}/1.4-fix-dmx-build.patch
-	${FILESDIR}/1.4-fix-dmx-link.patch
-	${FILESDIR}/1.4-fix-xephyr-link.patch
-	${FILESDIR}/1.4-fix-xprint-build.patch
-	${FILESDIR}/1.4-fix-xprint-link.patch
-	${FILESDIR}/1.4-fix-kdrive-automake.patch
-	${FILESDIR}/1.4-dont-hang-openoffice.patch
-	${FILESDIR}/${PV}-clean-generated-files.patch
-	${FILESDIR}/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
-	${FILESDIR}/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
-	${FILESDIR}/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
-	${FILESDIR}/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
-	${FILESDIR}/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
-	${FILESDIR}/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
-	${FILESDIR}/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
-	${FILESDIR}/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
-	${FILESDIR}/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
-	"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		$(use_enable !minimal xorgcfg)
-		$(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
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Clean up for ${PV}-clean-generated-files.patch
-	pushd hw/xprint >/dev/null
-	rm -f *-wrapper.c || die
-	popd >/dev/null
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use dmx || use xprint; then
-			SNAPSHOT="yes"
-		fi
-	fi
-
-	if use hal; then
-		sed -i \
-			-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
-			"${S}"/config/Makefile.am \
-			|| die "failed to fix DBUS config directory"
-		SNAPSHOT="yes"
-	fi
-
-	x-modular_reconf_source
-	#do not install xprint's Xsession.d files, we'll do it later
-	if use xprint; then
-		sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \
-		    -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \
-		    || die "sed of Xsession.d makefile failed"
-	fi
-}
-
-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.3"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	ewarn "Here's a list of installed X drivers to emerge:"
-	print_installed x11-drivers/
-
-	echo
-	ewarn "You can generate a similar list at any point 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
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				"${S}"/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-print_installed() {
-	local command line token=$1
-
-	if $(type -P qlist >/dev/null 2>&1); then
-		command="qlist -I -C ${token}"
-	elif $(type -P equery >/dev/null 2>&1); then
-		command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'"
-	elif $(type -P epm >/dev/null 2>&1); then
-		command="epm -qaG | grep ${token}"
-	else
-		local dir
-		command="true"
-		for dir in "${PORTDIR}"/${token}*; do
-			command="${command} ; best_version ${dir#${PORTDIR}/}"
-		done
-	fi
-	while read line; do
-		ewarn "${line}"
-	done < <(eval ${command})
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe "${S}"/hw/xprint/etc/init.d/xprint
-	# Install the wrapper
-	newinitd "${FILESDIR}"/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins "${S}"/hw/xprint/etc/profile.d/xprint*
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
-	# Patch profile scripts
-	sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
-		"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc "${D}"/etc/profile.d/xprint*
-	rm -f "${D}"/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}