add xorg-server-1.4-r2.ebuild

Signed-off-by: Zhang Le <r0bertz@gentoo.org>

24 files changed, 1467 insertions, 0 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0881330..da6dfcf 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -54,6 +54,14 @@ AUX 1.2.0-client-leak.patch 363 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a
 MD5 c46eeebdde41ceb57f1dca6ef4b1a8b7 files/1.2.0-client-leak.patch 363
 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a files/1.2.0-client-leak.patch 363
 SHA256 5969bf63e88ab4030c6913237379b76fb55e9e1f249a058eb17487a4b7103b87 files/1.2.0-client-leak.patch 363
+AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
+MD5 cd4cb28e832a2232b4a7c492f964d5bb files/1.2.0-fix-amd-cpu-detection.patch 1715
+RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c files/1.2.0-fix-amd-cpu-detection.patch 1715
+SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a files/1.2.0-fix-amd-cpu-detection.patch 1715
+AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
+MD5 a4b32046f3cfde77ae5f964faabf0254 files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
+RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
+SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
 AUX 1.2.0-server-damage-version.patch 1322 RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 SHA1 129565a0151d42b85c43f273da507396111bdc9b SHA256 28a049c39e7995f7768eed34993f12252da416093e2f919c1ae84cb2dfee9f09
 MD5 789e294aaa7f8a03551f639dc022c568 files/1.2.0-server-damage-version.patch 1322
 RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 files/1.2.0-server-damage-version.patch 1322
@@ -62,10 +70,70 @@ AUX 1.2.0-server-randr-version.patch 444 RMD160 05a4c38c141bf5dddd1f94eb61dba62b
 MD5 e14a71605039b6cded7ce9541ded2f1e files/1.2.0-server-randr-version.patch 444
 RMD160 05a4c38c141bf5dddd1f94eb61dba62b79f17658 files/1.2.0-server-randr-version.patch 444
 SHA256 226560c2d5c0c76987e2e315c2eef805e96ee9189aa3394148968fa13392f17e files/1.2.0-server-randr-version.patch 444
+AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
+MD5 5e95f0f8fcc3af424c4404a1fcf485ca files/1.2.0-typo-fix.patch 1321
+RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 files/1.2.0-typo-fix.patch 1321
+SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd files/1.2.0-typo-fix.patch 1321
+AUX 1.2.0-zero-out-client-devprivates-on-allocation.patch 1284 RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 SHA1 0cfd5dcb57c42197e39e5469032833ea932c0b4f SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34
+MD5 2da60d0b56f71d5443510127e368031b files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
+RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
+SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34 files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
 AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
 MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
 SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
+AUX 1.3-alpha-build-fix.patch 1151 RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c SHA1 210ef43db8ad8080db21a86c31f7744dbdb7e439 SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186
+MD5 57ebd1cc02ac21fcb364e4b72dfa7fb9 files/1.3-alpha-build-fix.patch 1151
+RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c files/1.3-alpha-build-fix.patch 1151
+SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186 files/1.3-alpha-build-fix.patch 1151
+AUX 1.3.0.0-use-proc-instead-of-sys.patch 686 RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb SHA1 44112c3643d026f318850f2b763f3ca3952bb686 SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54
+MD5 27f7679638163b088c8b1ede97ac6070 files/1.3.0.0-use-proc-instead-of-sys.patch 686
+RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb files/1.3.0.0-use-proc-instead-of-sys.patch 686
+SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54 files/1.3.0.0-use-proc-instead-of-sys.patch 686
+AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
+MD5 fdb6a6dc410014f5babbb6338d89a689 files/1.3.0.0-xephyr_crash_at_exit.patch 1039
+RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e files/1.3.0.0-xephyr_crash_at_exit.patch 1039
+SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d files/1.3.0.0-xephyr_crash_at_exit.patch 1039
+AUX 1.4-document-new-font-catalogs.patch 4540 RMD160 92e450666e840fefb8604dc664ce0276e01c28d7 SHA1 6bf78fde99494b047658836adfa35b5d75224214 SHA256 8a73f0a01235c6cb1acefa09a726f68089fc10c1d68ffdf2e1b57091caafbbfd
+MD5 ae4098e2defa6ab7d07f52105f5784c7 files/1.4-document-new-font-catalogs.patch 4540
+RMD160 92e450666e840fefb8604dc664ce0276e01c28d7 files/1.4-document-new-font-catalogs.patch 4540
+SHA256 8a73f0a01235c6cb1acefa09a726f68089fc10c1d68ffdf2e1b57091caafbbfd files/1.4-document-new-font-catalogs.patch 4540
+AUX 1.4-fix-dmx-build.patch 509 RMD160 699daf15f9ff4878a1583acaf5bc7c01afb5904c SHA1 0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf SHA256 4a01681656d09780dd15696804ce8210a4a5324bf63c33a7692e8971fbeb1843
+MD5 e2f197248e9c0888ab64294d6bd335eb files/1.4-fix-dmx-build.patch 509
+RMD160 699daf15f9ff4878a1583acaf5bc7c01afb5904c files/1.4-fix-dmx-build.patch 509
+SHA256 4a01681656d09780dd15696804ce8210a4a5324bf63c33a7692e8971fbeb1843 files/1.4-fix-dmx-build.patch 509
+AUX 1.4-fix-dmx-link.patch 363 RMD160 429ce2827b9a5047ea7ad5ca4ec93740e85099af SHA1 41f686ef462e179f6c7e73a1babb7c0f2312d337 SHA256 50fbbe7391a354de2fa321944b921193e1097eaed4d775e343687f4a1a33a002
+MD5 49206d18902c871f3be65363a3a4ef48 files/1.4-fix-dmx-link.patch 363
+RMD160 429ce2827b9a5047ea7ad5ca4ec93740e85099af files/1.4-fix-dmx-link.patch 363
+SHA256 50fbbe7391a354de2fa321944b921193e1097eaed4d775e343687f4a1a33a002 files/1.4-fix-dmx-link.patch 363
+AUX 1.4-fix-xephyr-link.patch 850 RMD160 574c9e4b38ceaf5964bfcd9020842b027f22cac1 SHA1 352c55be4b91b29c84b192d806a90834d887fc22 SHA256 89761f041d694db9891a5a72ff0ee1066d08c2d19a5cec448482fb2b427d2c10
+MD5 1365c9060a61fa1e2c59d2ddff8c68ae files/1.4-fix-xephyr-link.patch 850
+RMD160 574c9e4b38ceaf5964bfcd9020842b027f22cac1 files/1.4-fix-xephyr-link.patch 850
+SHA256 89761f041d694db9891a5a72ff0ee1066d08c2d19a5cec448482fb2b427d2c10 files/1.4-fix-xephyr-link.patch 850
+AUX 1.4-fix-xprint-build.patch 413 RMD160 79275b83b2a41bd4a7488011a9d2b93d6ec0400f SHA1 e2611665d555d5dc93ede0ab4beb9acb16b6b5aa SHA256 183a6c7d6f506dcd637a10057421811901035ed802c27cdd6bc6869924337d40
+MD5 b7658fc886e6e0083a85ce3972ae72f0 files/1.4-fix-xprint-build.patch 413
+RMD160 79275b83b2a41bd4a7488011a9d2b93d6ec0400f files/1.4-fix-xprint-build.patch 413
+SHA256 183a6c7d6f506dcd637a10057421811901035ed802c27cdd6bc6869924337d40 files/1.4-fix-xprint-build.patch 413
+AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c6 SHA1 67f057700577562b6260d07a8e82ab2dad117a4c SHA256 f6f7a67c93dce63a6f16ccb2182fbd861c7627d071225251df4a733412eda7f0
+MD5 a8b45410a708ff7bc5eea157559a143b files/1.4-fix-xprint-link.patch 588
+RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c6 files/1.4-fix-xprint-link.patch 588
+SHA256 f6f7a67c93dce63a6f16ccb2182fbd861c7627d071225251df4a733412eda7f0 files/1.4-fix-xprint-link.patch 588
+AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
+MD5 23c038451c338040cc456b61998f8cbe files/1.4-fpic-libxf86config.patch 374
+RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 files/1.4-fpic-libxf86config.patch 374
+SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 files/1.4-fpic-libxf86config.patch 374
+AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
+MD5 563b0bd3cf629594784af3044351224a files/1.4-ia64.patch 1872
+RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c files/1.4-ia64.patch 1872
+SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec files/1.4-ia64.patch 1872
+AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
+MD5 c5f6f5dad5315cd737565bfbc58ff862 files/avoid-crash-on-minimized-xv-window.patch 1970
+RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 files/avoid-crash-on-minimized-xv-window.patch 1970
+SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd files/avoid-crash-on-minimized-xv-window.patch 1970
+AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
+MD5 a330688d72dc97a7c72db8b42ae45ded files/use-composite-for-unequal-depths.patch 3528
+RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea files/use-composite-for-unequal-depths.patch 3528
+SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0 files/use-composite-for-unequal-depths.patch 3528
 AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
 MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
@@ -82,17 +150,35 @@ AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037
 MD5 eb8a89c732436e561035fc866162eedb files/xorg-server-1.3.0.0-loongson.patch 1931
 RMD160 cc84def06fdfa7099342411baa037529166f56c0 files/xorg-server-1.3.0.0-loongson.patch 1931
 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90 files/xorg-server-1.3.0.0-loongson.patch 1931
+AUX xorg-server-1.4-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
+MD5 eb8a89c732436e561035fc866162eedb files/xorg-server-1.4-loongson.patch 1931
+RMD160 cc84def06fdfa7099342411baa037529166f56c0 files/xorg-server-1.4-loongson.patch 1931
+SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90 files/xorg-server-1.4-loongson.patch 1931
+AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
+MD5 40692dd1eba5bf76e835a955a54b5b7b files/xorg-server-sam225bw-quirks.patch 380
+RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 files/xorg-server-sam225bw-quirks.patch 380
+SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517 files/xorg-server-sam225bw-quirks.patch 380
+AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
+MD5 98036aad5eee4ad924dd1fa0f556cc1c files/xorg-x11-server-1.0.1-fpic-libxf86config.patch 332
+RMD160 3981b8fbb19142c7944f59237cf57394337ec952 files/xorg-x11-server-1.0.1-fpic-libxf86config.patch 332
+SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6 files/xorg-x11-server-1.0.1-fpic-libxf86config.patch 332
 AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
+AUX xorg-xserver-1.2.0-xcmisc.diff 981 RMD160 66afbb0d9c6017795c8a7537bd1d8e6000ba67e9 SHA1 3557cbe23be6912106ed7220d95301311fb93a26 SHA256 cc98577740689020020794c322069a5e2520bca8c0998efdab149994773ebba5
+MD5 0fa07a8fb2bc14fa01fc29e42b89c59e files/xorg-xserver-1.2.0-xcmisc.diff 981
+RMD160 66afbb0d9c6017795c8a7537bd1d8e6000ba67e9 files/xorg-xserver-1.2.0-xcmisc.diff 981
+SHA256 cc98577740689020020794c322069a5e2520bca8c0998efdab149994773ebba5 files/xorg-xserver-1.2.0-xcmisc.diff 981
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
+DIST MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 SHA1 deb1002cf377ba8bd9407bd3cf573f8c8be31671 SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
 DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
 DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
+DIST xorg-server-1.4.tar.bz2 6179392 RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 SHA1 3aa6327f4def4d33ce2a8d6d7587295db231ab6d SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
 EBUILD xorg-server-1.2.0-r1.ebuild 16442 RMD160 ac4717116f699a89feb7070b57123cfc7bc2dc07 SHA1 8996dccbdbfe6c1a54122bf8ffc3a22886646c5b SHA256 becbdd3224bc6acc1cd1bf7933000d2a1f99042cb59ab074419b8057ee7f4e13
 MD5 e70fcb819cdf4877377b74d7a1b7b98b xorg-server-1.2.0-r1.ebuild 16442
 RMD160 ac4717116f699a89feb7070b57123cfc7bc2dc07 xorg-server-1.2.0-r1.ebuild 16442
@@ -105,6 +191,10 @@ EBUILD xorg-server-1.3.0.0.ebuild 16332 RMD160 96f7260adacacec77d9eff7a1459c87a9
 MD5 23808a3e81201ffca520193a0140fbb2 xorg-server-1.3.0.0.ebuild 16332
 RMD160 96f7260adacacec77d9eff7a1459c87a9b9d5ae8 xorg-server-1.3.0.0.ebuild 16332
 SHA256 582a8abbfcd8962944b5a751a0ce385add7d33354e905b1ef52e6b55d747c7dc xorg-server-1.3.0.0.ebuild 16332
+EBUILD xorg-server-1.4-r2.ebuild 17876 RMD160 a83957b141d65c928d1cde23995f3e59f3591b1d SHA1 2e2ac24296c561be801bdba68e76e4c3dcf5a00d SHA256 adf50c200ccf2755ff6ac04a64ac946b75c0bf7a18fd8fd42719d2676450fa06
+MD5 4139f5c398f8340a8358df05c5a00f9c xorg-server-1.4-r2.ebuild 17876
+RMD160 a83957b141d65c928d1cde23995f3e59f3591b1d xorg-server-1.4-r2.ebuild 17876
+SHA256 adf50c200ccf2755ff6ac04a64ac946b75c0bf7a18fd8fd42719d2676450fa06 xorg-server-1.4-r2.ebuild 17876
 MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7
 MD5 e31a590302270c7d0072ec4c5e2b8cde ChangeLog 46548
 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed ChangeLog 46548
@@ -122,3 +212,6 @@ SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/di
 MD5 f5088a38f31782713a97f0cf19bfbbd1 files/digest-xorg-server-1.3.0.0 512
 RMD160 70dafff2a513850c2631793f877a2ffe294758c6 files/digest-xorg-server-1.3.0.0 512
 SHA256 ae8d04a5e64f7aedd5cc910085a1db5ce1638012a3bfedeab142ce99b0d3968a files/digest-xorg-server-1.3.0.0 512
+MD5 a786bf92e7f6a676ca17c72643400702 files/digest-xorg-server-1.4-r2 500
+RMD160 d88df94e7c8c7a0e16aff8d597ce8e7e570331b2 files/digest-xorg-server-1.4-r2 500
+SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/digest-xorg-server-1.4-r2 500
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
new file mode 100644
index 0000000..48775d3
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 0000000..b4747c4
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 0000000..0a15217
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000..7c6144b
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
@@ -0,0 +1,36 @@
+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-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
new file mode 100644
index 0000000..481e4ad
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
@@ -0,0 +1,36 @@
+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-use-proc-instead-of-sys.patch b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
new file mode 100644
index 0000000..600d0ba
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..4e5b130
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
@@ -0,0 +1,30 @@
+* 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-document-new-font-catalogs.patch b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
new file mode 100644
index 0000000..e9a6aad
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
@@ -0,0 +1,132 @@
+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-fix-dmx-build.patch b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
new file mode 100644
index 0000000..07f43ab
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000..909442d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..35ca029
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..98fbacf
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..1cf7205
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
@@ -0,0 +1,13 @@
+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-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
new file mode 100644
index 0000000..c3b9ebd
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
+index 849ee8b..1b49d48 100644
+--- a/hw/xfree86/parser/Makefile.am
++++ b/hw/xfree86/parser/Makefile.am
+@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
+ 	DRI.c \
+ 	Extensions.c
+ 
+-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
+ 
+ EXTRA_DIST = \
+ 	Configint.h \
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch
new file mode 100644
index 0000000..13ffb5f
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-ia64.patch
@@ -0,0 +1,49 @@
+--- /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/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
new file mode 100644
index 0000000..23eeca1
--- /dev/null
+++ b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
@@ -0,0 +1,55 @@
+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/digest-xorg-server-1.4-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
new file mode 100644
index 0000000..c06a742
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
@@ -0,0 +1,6 @@
+MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538
+RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538
+SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538
+MD5 a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 6179392
+RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 xorg-server-1.4.tar.bz2 6179392
+SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 xorg-server-1.4.tar.bz2 6179392
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
new file mode 100644
index 0000000..fd2c5ad
--- /dev/null
+++ b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
@@ -0,0 +1,124 @@
+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-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
new file mode 100644
index 0000000..04ee66e
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
@@ -0,0 +1,51 @@
+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__)
++#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(__sh__) && !defined(__hppa__)
+         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/files/xorg-server-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
new file mode 100644
index 0000000..ca5bbb4
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 0000000..a6a35f9
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
@@ -0,0 +1,11 @@
+--- 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.2.0-xcmisc.diff b/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
new file mode 100644
index 0000000..b67d2ee
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
@@ -0,0 +1,38 @@
+diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
+index f26218e..8c7a86e 100644
+--- a/Xext/xcmisc.c
++++ b/Xext/xcmisc.c
+@@ -42,6 +42,12 @@ #include "swaprep.h"
+ #include <X11/extensions/xcmiscstr.h>
+ #include "modinit.h"
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ #if 0
+ static unsigned char XCMiscCode;
+ #endif
+@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
+ 
+     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
+ 
+-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
++    if (stuff->count > UINT32_MAX / sizeof(XID))
++	    return BadAlloc;
++
++    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
+     if (!pids)
+     {
+ 	return BadAlloc;
+@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
+     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
+ 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
+     }
+-    DEALLOCATE_LOCAL(pids);
++    Xfree(pids);
+     return(client->noClientException);
+ }
+ 
diff --git a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
new file mode 100644
index 0000000..d101590
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.3 2007/10/01 14:32:34 cardoe 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.1"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+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_nvidia"
+#	video_cards_fglrx"
+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}
+	>=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_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 )
+		!x11-drivers/ati-drivers
+	)"
+#		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
+LICENSE="${LICENSE} MIT"
+
+PATCHES="
+	${FILESDIR}/${PV}-ia64.patch
+	${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
+	${FILESDIR}/${PV}-fpic-libxf86config.patch
+	${FILESDIR}/${PV}-document-new-font-catalogs.patch
+	${FILESDIR}/${PV}-fix-dmx-build.patch
+	${FILESDIR}/${PV}-fix-dmx-link.patch
+	${FILESDIR}/${PV}-fix-xephyr-link.patch
+	${FILESDIR}/${PV}-fix-xprint-build.patch
+	${FILESDIR}/${PV}-fix-xprint-link.patch
+	${FILESDIR}/${P}-loongson.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
+
+	# 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
+}
+
+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."
+	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
+
+	# smi and via are the only things on line 2. If line 2 ends up blank,
+	# we need to get rid of the backslash at the end of line 1.
+	if ! use video_cards_siliconmotion && ! use video_cards_via; then
+		sed -i \
+			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
+			"${S}"/hw/kdrive/Makefile.am
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	use xprint && xprint_src_install
+
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	doexe "${S}"/hw/xprint/etc/init.d/xprint
+	# Install the wrapper
+	newinitd "${FILESDIR}"/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins "${S}"/hw/xprint/etc/profile.d/xprint*
+	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."
+}