Fix building with gcc-4.8 and -O3, bug #472058. Apply patches for ia64, bug #447152.

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

6 files changed, 412 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f38a5c99aa4f..850c75261915 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.748 2013/08/23 17:56:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.749 2013/09/11 21:14:04 chithanh Exp $
+
+*xorg-server-1.14.2.902-r1 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xorg-server-1.12-ia64-fix_inx_outx.patch,
+  +files/xorg-server-1.12-unloadsubmodule.patch,
+  +files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch,
+  +xorg-server-1.14.2.902-r1.ebuild:
+  Fix building with gcc-4.8 and -O3, bug #472058. Apply patches for ia64, bug
+  #447152.
 
 *xorg-server-1.14.2.902 (23 Aug 2013)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f02d5af4aa1a..f63c73b8281c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,7 +8,10 @@ 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-cve-2013-1940.patch 1191 SHA256 cd2c72854f04bf8140e8c5beee51f7575eac63857b01353daec63d8d473d75c5 SHA512 cd38bf7fed8bde0b69c55c05b6e275843eb78178669cbbbcf313edbfcd02a91c4f297898f0220faa1e3592bec8e24e5b9a708499f6e63c2e8c15655de3f7149b WHIRLPOOL 3522bd9735e83f6ee6d9c1efc5bdfa41684dae9b9e49f92005ac7c54f1b9f7c23904042cb9714d97c73832272d6b92b5eaed16982392b0707f3ee82ca893de02
 AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
+AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
+AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
 AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
+AUX xorg-server-1.14-kdrive-out-of-bounds-array-access.patch 1281 SHA256 35b1d81fee99e69912518e04ac444da91469ced50c569a50e91c91b1e9bce3f2 SHA512 4eb101f1c4332351f1d06052cb7515743211da0970d358f8327265037b2997f4912e41b2fe8d2fac23f123da22b5ce4e57f152e2fc072b82d32943584fb5410b WHIRLPOOL 3aa841480873fa80a4861be1f419b6762c70a37977b52f843796663aaacd85020b7138444b363951d4a765d60e3bebe1adc6404424ec889db7664261f898be6a
 AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01
 AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
 AUX xorg-server-disable-acpi.patch 663 SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf WHIRLPOOL 69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558
@@ -27,9 +30,10 @@ EBUILD xorg-server-1.11.4-r2.ebuild 7391 SHA256 ae064266bea347c773d9fc4349e59629
 EBUILD xorg-server-1.12.4-r1.ebuild 7058 SHA256 3b0d0059dbf959df79a5d28c4e87b56d1513e9ffd490019299a9a90b56e416b5 SHA512 c5aedb627c1e3c55d6cd5ecc6b39e5d2a4a939e0dac53f4a49b7be7bb6f858063fee5fe74159d13876aece106cacc753c6a790ab5fb4a1f137c71f7a1f1c472f WHIRLPOOL 35a4037bed8ed9c37f6b508007abbe64e5c978e18256de77efff55bc50b6cce26ccb44984105dc265d49fd3a72b39a7a438513d586a5a60189b58eade6c003d4
 EBUILD xorg-server-1.13.4.ebuild 6998 SHA256 90ad778a2b3c5fdcc18d1b774d0b6a35b81ba6b98b60ddbcd8ba4cd2d6d86832 SHA512 ef957d8c7ce1d6367d3f83517738ff48924b2ef9210b27759a24cb3e06e1ba977194a64994811a0a7e9256ec4b4e32d2d4369078a6789484dbe0db68a9b3cabe WHIRLPOOL 3610f774d94e7b3e828c936730b2f8dcac828358a1f971eed3031e7d65202feb9b51cda8d41645aa54dc1663e0001e456fd3e35596a12957a6449f97540dfec4
 EBUILD xorg-server-1.14.1.ebuild 6993 SHA256 f9d64cea7d8e2cea0f99433cb56bbd607881ffaa300f70a73cda6fb9bb2be3ec SHA512 1aa2f2655cccaa4fffd52e274ef97bf4916d4161937cb7134fc7c8b8105ac4b1bf8cecb21efe41e230dcd7180e138f7edf3ad56aba1cc3336a41ad7a37389ebf WHIRLPOOL 9f1e6d70cfd1bcc37bf6a3b1806219c0d584930fa9f9a49daff8a2b5a3582c4d5031f6fc6ecdf6b5376b8024417d4034672f242bdab986985fbc65e3dbf02a2c
+EBUILD xorg-server-1.14.2.902-r1.ebuild 7165 SHA256 3b9752b840e5ba73fd747579eeb11b16f0f5f451008f4e62b8b627ee5cb13922 SHA512 f9c8168e9d0e38d54848e3aabac251bf7ca3d3206730dfa18ea26bdbebb3e338a6b874b9b0a6fcfe4b3be8bc310b2f357d8df9f4c07c360a142893850b950375 WHIRLPOOL 766c2beb5ac78b5ec9f4dc4df5a5a20ecaa8d707ffee2cf19b9c8586866b72408a714789a6310b33602197e3862417de71c7331b083a258519f6739aa5583d0d
 EBUILD xorg-server-1.14.2.902.ebuild 6997 SHA256 0ac248bfb22f0a242af93d2f542880d9f27f90d06de793206eb139a706d7463d SHA512 9b4c81c0efa38deb3c6512b3e236dcc8bbccbaf225c067e70cdf380a3bad3ff7f4a7b7bca2de0bba6ffc2b733565e4ff9e7684640fd7e4eef34787fc4e0fb1e6 WHIRLPOOL 9b2d823ad7c25f7620038a29e8dee86fc7951631e3c9ec9bcd046d7704e16707c3139981e109fdc5514f09c8f0fa488d01c620a5ed331141ae5c6c172b0a5849
 EBUILD xorg-server-1.14.2.ebuild 6993 SHA256 c02f70f7e2ce2931f763328012bf45a3c2f8c79530a9855751855376deb32abf SHA512 9d19036f61216c80bbd60ea777fbe27807e385a9e050c6ee9babcf13e647d4629b306f4c8778247ab029e4a5b97d49cf27ff583cbe86243202d84cecbd00c371 WHIRLPOOL 469d6c9eea480b10f9e255f0786cb4198b297599ccf08cb59d05e9006079e0ec4890500ffcd4de9730f46ec9e5cf95aa5722c34cf2eb675d661a251f2cd98d2f
 EBUILD xorg-server-1.9.5-r2.ebuild 7925 SHA256 07bf78aab6229019bd88f1778564fe32ee9802eef200d61e96e55bccd5048800 SHA512 9b204a74d70deee2b4b7093c27d3faaecbb3f479e19f7d17d59a6ffb1116bbcaaafde5eddcc9f2e01789e43ebf59f3d82e3d94ebae04177534480de876cc5fe0 WHIRLPOOL ded655272aa87d651f6370836effa6588457196e8bd269bc7faeec87f606b6d81902d241bcb0b792b18992b885bdb861e244bab460d2eae29ca4e44c9a9f8e75
-MISC ChangeLog 46120 SHA256 8fd256b4810f5dacc2c491a49bb77fbdbf4a0acbc7dab3e4c38b3a52c8a2c003 SHA512 3f68a52934d8cb3e70c350f99c7f3705174c48cc805311f1ffcad64487e14b218cc7f807c79312b9dde0907451a6c10c3ea135e4f1ac99dd0c8827d11884ad12 WHIRLPOOL 1e52e26017c20a061e117f915178f160dc238363910ab5449eb584dd91137670a7c2c44b7cdbcd3c62bd8103bd4ad3b0bd55b5869eeeee04ae5b872a13deb5dd
+MISC ChangeLog 46525 SHA256 36627ee1f1a414093fe04b07933f7bc77d8981612beb01c344102d3f695b2253 SHA512 96bfdcaa6a5631aa0f64179eae03cc4d3c389fd349e8de6af3ff494afc853cbe9319a432a59d8278fd624bd0208bbb71824ec0a3a9b922a8b9fa24696bc3d960 WHIRLPOOL 57c9cf687fbfddfd4e91237280fa2e4612396ecec5ae8dcd73de71a59fd70552b7dde6864ed238bd438f085a0b3577e5bdeb6091ba3a7fc10fd85ce2e0771cab
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
new file mode 100644
index 000000000000..24a5a02f4fd6
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
@@ -0,0 +1,60 @@
+diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h
+*** xorg-server-1.12.3/hw/xfree86/common/compiler.h	2012-07-06 07:17:19.000000000 +0200
+--- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h	2012-08-29 00:14:39.000000000 +0200
+***************
+*** 421,426 ****
+--- 421,474 ----
+  #include <machine/pio.h>
+  #endif                          /* __NetBSD__ */
+  
++ #elif defined(linux) && defined(__ia64__)
++ /* for Linux on ia64, we use the LIBC _inx/_outx routines */
++ /* note that the appropriate setup via "ioperm" needs to be done */
++ /*  *before* any inx/outx is done. */
++ 
++ extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
++ extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
++ extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
++ extern _X_EXPORT unsigned int _inb(unsigned long port);
++ extern _X_EXPORT unsigned int _inw(unsigned long port);
++ extern _X_EXPORT unsigned int _inl(unsigned long port);
++ 
++ static __inline__ void
++ outb(unsigned long port, unsigned char val)
++ {
++     _outb(val, port);
++ }
++ 
++ static __inline__ void
++ outw(unsigned long port, unsigned short val)
++ {
++     _outw(val, port);
++ }
++ 
++ static __inline__ void
++ outl(unsigned long port, unsigned int val)
++ {
++     _outl(val, port);
++ }
++ 
++ static __inline__ unsigned int
++ inb(unsigned long port)
++ {
++     return _inb(port);
++ }
++ 
++ static __inline__ unsigned int
++ inw(unsigned long port)
++ {
++     return _inw(port);
++ }
++ 
++ static __inline__ unsigned int
++ inl(unsigned long port)
++ {
++     return _inl(port);
++ }
++ 
+  #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
+  
+  #include <inttypes.h>
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
new file mode 100644
index 000000000000..57c7349da6a7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -0,0 +1,53 @@
+diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c	2012-09-05 18:26:42.000000000 +0200
++++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c	2012-09-05 18:28:54.000000000 +0200
+@@ -1109,39 +1109,38 @@
+ static void
+ RemoveChild(ModuleDescPtr child)
+ {
+     ModuleDescPtr mdp;
+     ModuleDescPtr prevsib;
+     ModuleDescPtr parent;
+ 
+     if (!child->parent)
+         return;
+ 
+     parent = child->parent;
+     if (parent->child == child) {
+         parent->child = child->sib;
+-        return;
+-    }
+-
+-    prevsib = parent->child;
+-    mdp = prevsib->sib;
+-    while (mdp && mdp != child) {
+-        prevsib = mdp;
+-        mdp = mdp->sib;
++    }
++    else {
++        prevsib = parent->child;
++        mdp = prevsib->sib;
++        while (mdp && mdp != child) {
++            prevsib = mdp;
++            mdp = mdp->sib;
++        }
++        if (mdp == child)
++            prevsib->sib = child->sib;
+     }
+-    if (mdp == child)
+-        prevsib->sib = child->sib;
+     child->sib = NULL;
+-    return;
+ }
+ 
+ void
+ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
+ {
+     const char *msg;
+     MessageType type = X_ERROR;
+ 
+     switch (errmaj) {
+     case LDR_NOERROR:
+         msg = "no error";
+         break;
+     case LDR_NOMEM:
diff --git a/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch b/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch
new file mode 100644
index 000000000000..f4a3bff66934
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.14-kdrive-out-of-bounds-array-access.patch
@@ -0,0 +1,34 @@
+From af1c57152e10cfa55843e6330cffc6a3c8c517d3 Mon Sep 17 00:00:00 2001
+From: Chris Clayton <chris2553@googlemail.com>
+Date: Wed, 04 Sep 2013 05:42:04 +0000
+Subject: kdrive: fix build error on gcc 4.8 for out-of-bounds array access
+
+I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
+of gcc-4.8:
+
+input.c:225:43: error: array subscript is above array bounds
+[-Werror=array-bounds]
+
+This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
+KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
+be beyond the end of the array.
+
+Signed-off-by: Chris Clayton <chris2553@googlemail.com>
+Reviewed-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
+index b1068bb..09aae44 100644
+--- a/hw/kdrive/src/kinput.c
++++ b/hw/kdrive/src/kinput.c
+@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
+             if (do_close)
+                 close(kdInputFds[i].fd);
+             kdNumInputFds--;
+-            for (j = i; j < kdNumInputFds; j++)
++            for (j = i; j < (kdNumInputFds - 1); j++)
+                 kdInputFds[j] = kdInputFds[j + 1];
+             break;
+         }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild b/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild
new file mode 100644
index 000000000000..bf2bf4df8b07
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.14.2.902-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2013 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.14.2.902-r1.ebuild,v 1.1 2013/09/11 21:14:04 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+#XORG_EAUTORECONF=yes
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+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.27.2
+	>=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.2.99.1
+	>=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.2.0
+	>=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.12-ia64-fix_inx_outx.patch
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	"${FILESDIR}"/${PN}-1.14-kdrive-out-of-bounds-array-access.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="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/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 rebuild all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		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 ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/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 "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}