Version bump, add patch to fix building drivers on ia64, bug #447152.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 279 insertions, 22 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index a1c9fcbb3cb8..5be45eebf9bb 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.700 2012/12/20 23:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.701 2012/12/25 16:19:13 chithanh Exp $
+
+*xorg-server-1.13.1 (25 Dec 2012)
+
+  25 Dec 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xorg-server-1.13-ia64-asm.patch, +xorg-server-1.13.1.ebuild:
+  Version bump, add patch to fix building drivers on ia64, bug #447152.
 
   20 Dec 2012; Mike Frysinger <vapier@gentoo.org> xorg-server-1.13.0-r1.ebuild:
   Add USE=suid support by John Sheu from ChromiumOS #419485 by nzqr.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0322993e9a9e..dfbd889fef00 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xdm-setup.initd-1 346 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 SHA512 b12ef1a757213c2df2d4fb50691695fdaf00ee9edb7d4ec551980c48b6eb05598d3eda0db543719a11a82b019939fb4af82a19813d238a725dcc0d818379103e WHIRLPOOL 28a033355ec3871eba2dfdf45969e9ac354d8ae542dcb1449901af856b9c26314318f6a91cec81f2548caaede19d88e14eac2de0fd7dab8957a7358e94a594b2
 AUX xdm.confd-3 853 SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec SHA512 bc127d71087723c446bdb342c27c10b08445fb42d32bc98f76bb78e347c591702224a59c6007bf96c75dbdbe564614bb96e6cff6407d7a09a4052c3d36e80d99 WHIRLPOOL 4337fdbc5cab1ebfaa326f13630a852aa2c9de4866ffe0f1aa42f8840a29b56c878904863ec00a7b4012263c70d038f2440cf291e403013a1f4877e077892d61
 AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
@@ -15,6 +12,7 @@ AUX xorg-server-1.11-dix-send-focus-events.patch 2345 SHA256 77e1ce80ebf57718b5a
 AUX xorg-server-1.11-log-format-fix.patch 13585 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0 SHA512 d6c560aa7c7ae0aa0e893e81feaf45850c7b43764b725258db8fb71e3cb85b0ec5bfedb05385582adb2456a7a2cd745f14ef0476fb7139527c6b9c8890e9ab14 WHIRLPOOL 1bc8f276072e613d9c1788bb2df5d5a8e5e1374c71e134854ec8b2154e85321d89dbd5c7b7fe1a533658bc5f020ac3ccc07ccdc78b56029c5d8f0777e1096304
 AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
 AUX xorg-server-1.12-xf86edidmodes-array-bounds.patch 1219 SHA256 d781acc0ab5c34ab52d87135346a1346b529dce663779d1e8641252e260d4de2 SHA512 dcf1040e1055fe6910ea48c0e559a44c4416f41f4c706fc72698cae5816e3d435857f652f46e5e03abf585ed8bc96abc56e08a1db033fd1d6081da0c275da935 WHIRLPOOL acb6b53c0768408be0802c6194e694c075ebac41ba2c6f1cf79a44fddb874ddf973bc16e1442abb5b84bfb70d3d149ed8dac0b254483de6cd6aec8224af6a7b0
+AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
 AUX xorg-server-1.13.0-exa-track-source-pixmaps.patch 2803 SHA256 a9cdbe03cad8ffe355de8ae1bd05a2b3b900da409f8f4702c9a28f4c522d2888 SHA512 2d9634f60d22a0b4ea94d2122fdc0b565bc4e16cedad15ffb3459fa8a08b00bb990f996078f95d40c4b1fc84b8c9848e1b2784ecd48b6e51641e0f2982ef0262 WHIRLPOOL 7641904488db86144f8b96e20f262ab69a88b4b88781a006fc18f0a748e35d7c3b666b47e39f15f60b6a5a3c07c76e430cd116cc21ebcf4c7278146a0ac9d870
 AUX xorg-server-1.13.0-zaphod-screen-crossing.patch 1446 SHA256 5e7aff773e4a86613c500d317021e10ee3a535b2354e87322aded37d0b8ce51b SHA512 8e9adf98ddbf0a364cce1f6e0a74bad127339c783bb61dde7b412c92de997cc38bf241637c140f61c9ca104c6d012e03789d7b59dac1751140ab100ce84448b9 WHIRLPOOL 08279fdfaf04b775b872af2f0d04fc07f51a785000636b38b179b2b3d73c110eedd2b39276817136e7d480f33e9f057f4b99372ff4215bc484e4b7f5084a8567
 AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
@@ -27,6 +25,7 @@ DIST xorg-server-1.12.2.tar.bz2 5431841 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be
 DIST xorg-server-1.12.3.tar.bz2 5478028 SHA256 3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe SHA512 8fa3b55a5032ec02f525656f0081aca2d2320a1d9351bae89bc70209883f88da3c264d7b4e688c89f863fb5a3a661adbfc833c1352298e7ef4e39d73177f6b5f WHIRLPOOL 12bec207b79215214a4e9c32ed9ee4bf69659d901887e67bb4b7a3fae6ea11cc3bd18434a9cd249f8429cc92f1ed6c05b83c27c78fbec08d50b937d4502c5cc4
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
+DIST xorg-server-1.13.1.tar.bz2 5479530 SHA256 c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00 SHA512 8732be86efdf430bfefe3fea02892042da214d0eb018f12496329b20d7282697d4d92cfb59e35ecabe6a6ca9b034cb12c02e67f44ab4538917c470064719fa45 WHIRLPOOL ba61134f0b14b908dc99c5bd1b349f2307897d8d7905c04af2a377dbb578d615c9a594998b54b8765fca305669fa240e98a98b2155efea85a1c4d84659d46ed5
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
 EBUILD xorg-server-1.10.6-r1.ebuild 7142 SHA256 7958276d8b4c59ea954deea9d5f10c2cfa4937cb3a0bdb3d0d6f49c9653b38a3 SHA512 55935f2bfec3442eb3814937a0e4a78f86aaf1c97caa2dcf7813e353b11b5b8ca4d9599a625f9a64f7e88c14c4b9c677481beed46a85bbff6d9892d1adad4a5c WHIRLPOOL e207c59bde741f29a6f5de7a5ddb177c1d831f66a9be31df7b2af3c3c9c5d7914eb220260da0e5d123c4206fa0eba54ed989a4fb31dd1743dc444121683bdafc
 EBUILD xorg-server-1.11.4-r1.ebuild 7332 SHA256 7270d4e37cd84cdd583fe8b2b5f36b5bb9f2b2327deb5b4da8da17f9222436db SHA512 485b228505687041fa17bb2920a09f03aeb467e9c7e19bb2c4ca47c6337b20dc43324b05cd6941a2ff77d118d76358e941e9d5f60af671711e83d534504c45be WHIRLPOOL b94ade0494572130712b32606fcd665ffe1a929dc0253f7371fe20375bfa9d6b7971d7dd86b894ebb60db945bbc75fc951b4fb789b49b61a83628dfcb3f6f096
@@ -35,24 +34,8 @@ EBUILD xorg-server-1.12.3.ebuild 7004 SHA256 4b7efe23c76990ec9666226110589360822
 EBUILD xorg-server-1.12.4.ebuild 6997 SHA256 ab1496e0d24a1834fc7cca6ed0466bcbcb012b78583802fb3823d4413a5c745b SHA512 115b38b000a26afa5f0ff8b60d8a1dd29179b4bfcf7d9d4ac0ce5f43296d825ca46c501755540b67f3918572c75fbf29e8e1a3b3a5cfdb1c053da3db4162ea80 WHIRLPOOL 726b82a0ef7409e3e751cfa3124a024943f7962fc4ef174c7dc883c7bdf647115f1dfc925bd5577c11c17bbf0b0390dba33824de1444d193947d069a83c2b69e
 EBUILD xorg-server-1.13.0-r1.ebuild 7084 SHA256 027ad3142d5ee3eb9a035855dca044c99798b9100d2a452edbc0a6a77c155c63 SHA512 bdd6156489758b86e213591120ffd6a3e63ba69ed2fd7ad087fc2d5d1ce5e16a29d0fb9e7f2e8fc6abe0d80d0f20696720554ea7fdb77ffd6424dac1b3688f6d WHIRLPOOL 080c9615d73237fe4bbc0b7001558a2c35a86c2b8c60699faefdea9b89ea7acea479acc5116254776ccee54ed64743dda3f777f2d9168a536e2e14ed9eaaa2bf
 EBUILD xorg-server-1.13.0.ebuild 7027 SHA256 eac7dae27dca9f0c1d19c1841ecc18a1ed77c64a3ba9ff9dae4773cbe90c6ec7 SHA512 b35e4c55e4b9731bde44057623653585287745d653be6b003071c6a03ab444688434f08b7c5ebe45a6b042b07c42e2dbd573cdc59bdf8bd990bb7ec3e8beba18 WHIRLPOOL 3aeba2635a102a4d2cb93ac47e76708ebad82a5dfb6ac618b2c378f31acd4cf4545103fd36388e72d1d2a015e6b58fa568f0b49b2648844807df2225e6073aba
+EBUILD xorg-server-1.13.1.ebuild 7012 SHA256 bbccef7298baf915fc2a4df55856f2a729def85b29113c4245a0427a30300904 SHA512 1f830b77447d95daa28e3ea84a4cb27a519768e20795e16218dafbf9274c804591b62d952306a550a953b01cd04f50267ef3caabea46c91ad9eade9fe7c93ce2 WHIRLPOOL 5b6f4b6e0e20fee40eaebdeb8b62777b1fce4bad26fabeeade89fe2132c6879658f1b765269e58b55e248bdb5893db8e66790420ceaeb9357f4f3c225d89a303
 EBUILD xorg-server-1.9.5-r1.ebuild 7865 SHA256 4e75f287de81b0e5ac59841964d55e3479e51c6fa7bf3882e665f25e3ed9c62e SHA512 56a0418baab28f111bec6a4c7377b50a7320c6af69793132c791b01988863c6da3bf3239f10651cfa2893f53075185cc403d925d280307b5b8113e54477a4f50 WHIRLPOOL 83d8ab8b50edf55ab6603d9424aebafc7fc15b3a71e62df0032c64a057f28ed15877683b8c8bfa2fcd8df4f48e2306c965dd4cfc3b4e30f5d24537dfd7866634
-MISC ChangeLog 36922 SHA256 b30f0314ba296536a96f6d3fbbb0e46beb5d9ada155bf6c3a0615c0b68e838b5 SHA512 3908e72df4e22a4c819cacd143ed67b177e0708357102e403141b270d1ed811b9bf6d5fb9138033212092bdef73b0befaee3da9ae1f4c090b41f7d8b5b1a3f44 WHIRLPOOL 812f331e4f5410ae756f8ac6eb3e5d3964eca92dda3d0163563df0ed6b06c79bd690da9749dcb17ff8711fa31a20e7e8450b8c88a9b5572ce350db81840855be
+MISC ChangeLog 37171 SHA256 bae9995a4761d51aecd09e5007433326fe48e3e9ba40c8620071bf04581f6fb0 SHA512 b9b1edfbd78229bbc844746d2142d30b42a5ae92b13a8d931c64d89192e178be64005cde9f6578b79d3dc0972172857271f561769a1c9b436159f1cab68c1c49 WHIRLPOOL 5ef6041f4a3902845d9f69d1f80c23ea1dd01a87d10a3562c01d211ad13f17101d85ae60425d0919e3acaf3d6f07777bcc7dc64f785fcf89f44e8bbc7949e27b
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 537 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f SHA512 6b66fd87c679bd696c5b6f7c32026a2bdaf827f3ea375eb908965352c259354dc242321199cebfab72a8d7854e459798ee851feedc18fa36496aec965ca28676 WHIRLPOOL 751bb9c7446f7bfd44674256bee09d05252b03686be445538a1026c2075533660a3895a8d68f4b77cd3575f4cf589df2bcf9a6e1e493c13f169895f413ea6c78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQ06PyAAoJELEHsLL7fEFWB/gP/i9kWqZuPm4ViSy9+lijWoBd
-Thqz8D9varDAx0gysfJD63DdseZ4om5mEVtF6KTIOacbfq3JNFI2nMPg9i1eKBpI
-lJhodIMq7tFL4cY8Rkq3yCIy0vRETewZ3rqxPDkC2YvFFtqbt3PkySNquVe+Vqkk
-TxByz/q/uMPWeV9w93/bmMwhVNroG+r3Ou16AT76iutt7VP+D2+KIz9AwFPug0PP
-P94MdeZQJbFafTBWjDcIQX9/pvEf8dsrtTCzuirs70m+azrTcx1k6PiLsZlxWRJA
-Lebanyy4sHeqlIt4vPKfJk/rPPK1cdNo04IUKN525MpxQ+x2xxiVVSyYe4KIptjp
-3wdhhau3ZCGkVnlsjUdWB5jSzijak/5R+UTvALwTvjV/YcHBkhk+rBFZhYrPwtIl
-zCABJuzz4IlR1fDzYewoIJbkZ1SDAami+0nXDJ9OQFFfsR3Gk83tn4q3lOBcaOHO
-S+GZ3k5yym4omoXAVolSA+xRaaF8rIZFy24YHPivtGwGwe7TTjFKqzbYTu3+10L7
-R8uYNH6Q+Dd+yBK66543Q6YBWr6O2PBgi1yr9iOZ918C2IGzxg+hq9GUbGmBANPd
-X9dfYa6AfTIhz5vnSnNGcxgfS3XhaFpx67ZB2TA/LSoveek7O55Sj5fk4ejpRIWy
-FjkWR9tY0o3kNcVpMakM
-=HTNI
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch b/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
new file mode 100644
index 000000000000..024370494977
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
@@ -0,0 +1,21 @@
+diff -ur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+--- a/hw/xfree86/common/compiler.h	2012-10-14 01:38:50.000000000 +0200
++++ b/hw/xfree86/common/compiler.h	2012-12-25 14:59:05.637854813 +0100
+@@ -1351,7 +1351,7 @@
+ #else                           /* ix86 */
+ 
+ #if !defined(__SUNPRO_C)
+-#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
++#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__ia64__)
+ #ifdef GCCUSESGAS
+ 
+ /*
+@@ -1453,7 +1453,7 @@
+ 
+ #endif                          /* GCCUSESGAS */
+ 
+-#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
++#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__ia64__) */
+ 
+ static __inline__ void
+ outb(unsigned short port, unsigned char val)
diff --git a/x11-base/xorg-server/xorg-server-1.13.1.ebuild b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
new file mode 100644
index 000000000000..3dfa9245cb4a
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2012 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.13.1.ebuild,v 1.1 2012/12/25 16:19:13 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-8[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.16
+	>=x11-proto/inputproto-2.1.99.3
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.13-ia64-asm.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+	# 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
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--enable-libdrm
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-9 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+
+	if use udev && has_version virtual/udev[-keymap]; then
+		ewarn "virtual/udev was built without keymap support. This may cause input device"
+		ewarn "autoconfiguration to fail."
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	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/xorg-x11/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}